diff options
author | John Marino <marino@FreeBSD.org> | 2014-11-03 07:42:38 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2014-11-03 07:42:38 +0000 |
commit | dacf540fdabdc9d33e6aed5b011707a3f84b0d48 (patch) | |
tree | 0a7b1d370b2618ebb674cbcbaf36420e90d5df45 /net-mgmt/ccnet | |
parent | fed9871a5c67814076bf200290ea1c4e41a864d9 (diff) |
Notes
Diffstat (limited to 'net-mgmt/ccnet')
-rw-r--r-- | net-mgmt/ccnet/Makefile | 50 | ||||
-rw-r--r-- | net-mgmt/ccnet/distinfo | 2 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-configure.ac | 11 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-lib_Makefile.am | 48 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-lib_net.c | 11 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-lib_utils.c | 57 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-makefile.am | 17 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-net_common_getgateway.c | 11 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-net_common_processors_rcvcmd-proc.c | 45 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-net_common_processors_service-proxy-proc.c | 11 | ||||
-rw-r--r-- | net-mgmt/ccnet/files/patch-net_common_session.c | 10 | ||||
-rw-r--r-- | net-mgmt/ccnet/pkg-descr | 6 | ||||
-rw-r--r-- | net-mgmt/ccnet/pkg-plist | 87 |
13 files changed, 366 insertions, 0 deletions
diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile new file mode 100644 index 000000000000..30bb4df743c4 --- /dev/null +++ b/net-mgmt/ccnet/Makefile @@ -0,0 +1,50 @@ +# $FreeBSD$ + +PORTNAME= ccnet +PORTVERSION= 3.1.4 +CATEGORIES= net-mgmt devel + +MAINTAINER= yan_jingfeng@yahoo.com +COMMENT= Framework for writing networked applications + +LICENSE= GPLv3 + +BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala +LIB_DEPENDS= libsearpc.so:${PORTSDIR}/devel/libsearpc \ + libcrypto.so:${PORTSDIR}/security/openssl \ + libglib-2.0.so:${PORTSDIR}/devel/glib20 \ + libgobject-2.0.so:${PORTSDIR}/devel/glib20 \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libzdb.so:${PORTSDIR}/databases/libzdb \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ + libevent.so:${PORTSDIR}/devel/libevent2 \ + libjansson.so:${PORTSDIR}/devel/jansson + +USE_GITHUB= yes +GH_ACCOUNT= haiwen +GH_TAGNAME= v3.1.4 +GH_COMMIT= 6b55658 + +USES= autoreconf libtool pkgconfig pathfix python:2 +PATHFIX_MAKEFILEIN= Makefile.am +USE_LDCONFIG= yes + +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/event2 +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--enable-server +INSTALL_TARGET= install-strip + +WITH_OPENSSL_PORT= yes +USE_OPENSSL= yes + +WWWDIR= ${PREFIX}/www/haiwen/seafile-server + +post-install: + @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}/seafile/bin + ${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/ccnet-init \ + ${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-init + ${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/ccnet-server \ + ${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-server + +.include <bsd.port.mk> diff --git a/net-mgmt/ccnet/distinfo b/net-mgmt/ccnet/distinfo new file mode 100644 index 000000000000..880dd7de4c95 --- /dev/null +++ b/net-mgmt/ccnet/distinfo @@ -0,0 +1,2 @@ +SHA256 (ccnet-3.1.4.tar.gz) = 5838cff989fe1910aeda5a2801f331d479f76e7d2c00cb8d87f016a7e9b0ea8d +SIZE (ccnet-3.1.4.tar.gz) = 216920 diff --git a/net-mgmt/ccnet/files/patch-configure.ac b/net-mgmt/ccnet/files/patch-configure.ac new file mode 100644 index 000000000000..c049ed60162e --- /dev/null +++ b/net-mgmt/ccnet/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2014-06-10 04:41:45.000000000 -0400 ++++ configure.ac 2014-08-26 18:17:12.161128916 -0400 +@@ -218,7 +218,7 @@ + LIB_GDI32= + LIB_RT= + LIB_INTL= +- LIB_RESOLV=-lresolv ++ LIB_RESOLV= + LIB_UUID=-luuid + LIB_IPHLPAPI= + LIB_SHELL32= diff --git a/net-mgmt/ccnet/files/patch-lib_Makefile.am b/net-mgmt/ccnet/files/patch-lib_Makefile.am new file mode 100644 index 000000000000..dff0e932ecdc --- /dev/null +++ b/net-mgmt/ccnet/files/patch-lib_Makefile.am @@ -0,0 +1,48 @@ +--- lib/Makefile.am.orig 2014-07-31 06:20:28.000000000 -0400 ++++ lib/Makefile.am 2014-09-02 13:48:35.659991963 -0400 +@@ -19,7 +19,6 @@ + peer-common.h \ + string-util.h \ + libccnet_utils.h \ +- ccnet-object.h \ + rpc-common.h \ + net.h \ + utils.h \ +@@ -66,6 +65,8 @@ + + ccnet_object_define = ccnetobj.vala + ++valac_gen = ccnetobj.c ccnet-object.h ++ + ccnet-client.c: ccnet-object.h + + ccnet-object.h: ${ccnet_object_define} +@@ -78,15 +79,23 @@ + + searpc_gen = searpc-signature.h searpc-marshal.h + +-gensource: ${searpc_gen} ++gensource: ${searpc_gen} ${valac_gen} + +-${searpc_gen}: $(top_srcdir)/lib/rpc_table.py ++rpc_table.stamp: ${top_srcdir}/lib/rpc_table.py ++ @rm -f rpc_table.tmp ++ @touch rpc_table.tmp + @echo "[libsearpc]: generating rpc header files" +- @PYTHON@ `which searpc-codegen.py` $(top_srcdir)/lib/rpc_table.py ++ @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py + @echo "[libsearpc]: done" ++ @mv -f rpc_table.tmp $@ ++ ++${searpc_gen}: rpc_table.stamp + + clean-local: + rm -f ${searpc_gen} +- rm -f $(top_srcdir)/lib/rpc_table.pyc ++ rm -f rpc_table.pyc ++ rm -f rpc_table.stamp ++ rm -f rpc_table.tmp ++ rm -f ${valac_gen} + +-CLEANFILES = ${searpc_gen} ++CLEANFILES = ${searpc_gen} ${valac_gen} diff --git a/net-mgmt/ccnet/files/patch-lib_net.c b/net-mgmt/ccnet/files/patch-lib_net.c new file mode 100644 index 000000000000..27de2c2c957c --- /dev/null +++ b/net-mgmt/ccnet/files/patch-lib_net.c @@ -0,0 +1,11 @@ +--- lib/net.c.orig 2014-09-02 21:06:10.181095833 -0400 ++++ lib/net.c 2014-09-02 21:06:40.052390263 -0400 +@@ -154,7 +154,7 @@ + + snprintf (buf, sizeof(buf), "%d", port); + +- if ( (n = getaddrinfo(NULL, buf, &hints, &res) ) != 0) { ++ if ( (n = getaddrinfo("0.0.0.0", buf, &hints, &res) ) != 0) { + ccnet_warning ("getaddrinfo fails: %s\n", gai_strerror(n)); + return -1; + } diff --git a/net-mgmt/ccnet/files/patch-lib_utils.c b/net-mgmt/ccnet/files/patch-lib_utils.c new file mode 100644 index 000000000000..338787c42c3a --- /dev/null +++ b/net-mgmt/ccnet/files/patch-lib_utils.c @@ -0,0 +1,57 @@ +--- lib/utils.c.orig 2014-06-10 04:41:45.000000000 -0400 ++++ lib/utils.c 2014-07-28 14:32:24.000000000 -0400 +@@ -41,6 +41,10 @@ + #include <glib/gstdio.h> + #include <searpc-utils.h> + ++#ifdef __FreeBSD__ ++#include <netinet/in.h> ++#endif ++ + extern int inet_pton(int af, const char *src, void *dst); + + +@@ -1463,14 +1467,19 @@ + } + #endif /* ifdef WIN32 */ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + /* 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) + { + char path[512]; + /* fisrst construct a path like /proc/123/exe */ ++#if defined(__linux__) + if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) { ++#endif ++#if defined(__FreeBSD__) ++ if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) { ++#endif + return -1; + } + +@@ -1528,6 +1537,22 @@ + } + #endif + ++/* ++ * Finally, we should not enforce to use /proc ++#ifdef __FreeBSD__ ++gboolean process_is_running (const char *process_name) ++{ ++ //TODO ++ return FALSE; ++} ++ ++int count_process(const char *process_name) ++{ ++ return 0; ++} ++#endif ++*/ ++ + char* + ccnet_object_type_from_id (const char *object_id) + { diff --git a/net-mgmt/ccnet/files/patch-makefile.am b/net-mgmt/ccnet/files/patch-makefile.am new file mode 100644 index 000000000000..8b4ff8c41e04 --- /dev/null +++ b/net-mgmt/ccnet/files/patch-makefile.am @@ -0,0 +1,17 @@ +--- Makefile.am.orig 2014-07-21 07:24:46.000000000 -0400 ++++ Makefile.am 2014-07-21 07:25:02.000000000 -0400 +@@ -22,11 +22,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + install-data-local: +-if MACOS +- sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) +-else +- sed -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) +-endif ++ sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles) + + dist-hook: +- git log --format='%H' -1 > $(distdir)/latest_commit +\ No newline at end of file ++ git log --format='%H' -1 > $(distdir)/latest_commit diff --git a/net-mgmt/ccnet/files/patch-net_common_getgateway.c b/net-mgmt/ccnet/files/patch-net_common_getgateway.c new file mode 100644 index 000000000000..1529814e37db --- /dev/null +++ b/net-mgmt/ccnet/files/patch-net_common_getgateway.c @@ -0,0 +1,11 @@ +--- net/common/getgateway.c.orig 2014-07-28 14:30:13.000000000 -0400 ++++ net/common/getgateway.c 2014-07-28 14:30:29.000000000 -0400 +@@ -34,7 +34,7 @@ + #undef USE_SYSCTL_NET_ROUTE + #endif + +-#ifdef BSD ++#ifdef __FreeBSD__ + #undef USE_PROC_NET_ROUTE + #define USE_SOCKET_ROUTE + #undef USE_SYSCTL_NET_ROUTE diff --git a/net-mgmt/ccnet/files/patch-net_common_processors_rcvcmd-proc.c b/net-mgmt/ccnet/files/patch-net_common_processors_rcvcmd-proc.c new file mode 100644 index 000000000000..58fdc64d9f1c --- /dev/null +++ b/net-mgmt/ccnet/files/patch-net_common_processors_rcvcmd-proc.c @@ -0,0 +1,45 @@ +--- net/common/processors/rcvcmd-proc.c.orig 2014-09-02 15:49:07.244090539 -0400 ++++ net/common/processors/rcvcmd-proc.c 2014-09-02 15:52:55.749963338 -0400 +@@ -221,7 +221,7 @@ + int i; + + commands = g_strsplit_set (line, " \t", 10); +- for (i=0, pcmd = commands; *pcmd; pcmd++) ++ for (i = 0, pcmd = commands; *pcmd; pcmd++) + i++; + + if (i == 0) { +@@ -234,7 +234,6 @@ + if (c == NULL) { + ccnet_processor_send_response (processor, SC_UNKNONW_CMD, + SS_UNKNONW_CMD, NULL, 0); +- return; + } else + c->handler (processor, i, commands); + +@@ -534,7 +533,7 @@ + ret = -1; + + out: +- g_free (addr); ++ g_free (addr_port); + g_free (role); + g_free (peer_id); + if (peer) g_object_unref (peer); +@@ -707,6 +706,7 @@ + if (addr_port) { + peer = ccnet_peer_manager_add_resolve_peer ( + processor->session->peer_mgr, addr, port); ++ g_free (peer->intend_role); + peer->intend_role = g_strdup(role); + ccnet_processor_send_response (processor, SC_OK, SS_OK, NULL, 0); + ret = 0; +@@ -736,7 +736,7 @@ + ret = -1; + + out: +- g_free (addr); ++ g_free (addr_port); + g_free (role); + g_free (peer_id); + if (peer) g_object_unref (peer); diff --git a/net-mgmt/ccnet/files/patch-net_common_processors_service-proxy-proc.c b/net-mgmt/ccnet/files/patch-net_common_processors_service-proxy-proc.c new file mode 100644 index 000000000000..8f46dbcf7414 --- /dev/null +++ b/net-mgmt/ccnet/files/patch-net_common_processors_service-proxy-proc.c @@ -0,0 +1,11 @@ +--- net/common/processors/service-proxy-proc.c.orig 2014-09-02 15:47:22.827928455 -0400 ++++ net/common/processors/service-proxy-proc.c 2014-09-02 15:47:36.619949159 -0400 +@@ -43,7 +43,7 @@ + { + ServiceProxyPriv *priv = GET_PRIV(processor); + if (priv->name) { +- free (priv->name); ++ g_free (priv->name); + priv->name = NULL; + } + diff --git a/net-mgmt/ccnet/files/patch-net_common_session.c b/net-mgmt/ccnet/files/patch-net_common_session.c new file mode 100644 index 000000000000..287e2459da7a --- /dev/null +++ b/net-mgmt/ccnet/files/patch-net_common_session.c @@ -0,0 +1,10 @@ +--- net/common/session.c.orig 2014-09-03 04:04:21.072122386 -0400 ++++ net/common/session.c 2014-09-03 04:04:58.071390609 -0400 +@@ -168,6 +168,7 @@ + g_free (name); + g_free (user_name); + g_free (port_str); ++ g_free (lport_str); + #ifdef CCNET_SERVER + g_free (service_url); + #endif diff --git a/net-mgmt/ccnet/pkg-descr b/net-mgmt/ccnet/pkg-descr new file mode 100644 index 000000000000..cf23e561cb25 --- /dev/null +++ b/net-mgmt/ccnet/pkg-descr @@ -0,0 +1,6 @@ +Ccnet is a framework for writing networked applications in C. It provides +the services of peer identification, connection management, service +invocation, and message sending. Server has the management of user, group, +and cluster. + +WWW: https://github.com/haiwen/ccnet diff --git a/net-mgmt/ccnet/pkg-plist b/net-mgmt/ccnet/pkg-plist new file mode 100644 index 000000000000..9f272c4a439c --- /dev/null +++ b/net-mgmt/ccnet/pkg-plist @@ -0,0 +1,87 @@ +bin/ccnet +bin/ccnet-demo-client +bin/ccnet-demo-server +bin/ccnet-init +bin/ccnet-server +bin/ccnet-servtool +bin/ccnet-tool +include/ccnet.h +include/ccnet/async-rpc-proc.h +include/ccnet/ccnet-client.h +include/ccnet/ccnet-object.h +include/ccnet/ccnet-session-base.h +include/ccnet/ccnetrpc-transport.h +include/ccnet/cevent.h +include/ccnet/invoke-service-proc.h +include/ccnet/job-mgr.h +include/ccnet/message.h +include/ccnet/mqclient-proc.h +include/ccnet/option.h +include/ccnet/packet.h +include/ccnet/peer.h +include/ccnet/proc-factory.h +include/ccnet/processor.h +include/ccnet/rpcserver-proc.h +include/ccnet/sendcmd-proc.h +include/ccnet/status-code.h +include/ccnet/threaded-rpcserver-proc.h +include/ccnet/timer.h +include/ccnet/valid-check.h +lib/libccnet.a +lib/libccnet.so +lib/libccnet.so.0 +lib/libccnet.so.0.0.0 +%%PYTHON_SITELIBDIR%%/ccnet/__init__.py +%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc +%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py +%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py +%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py +%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py +%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py +%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py +%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo +%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py +%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc +%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo +%%PYTHON_SITELIBDIR%%/ccnet/client.py +%%PYTHON_SITELIBDIR%%/ccnet/client.pyc +%%PYTHON_SITELIBDIR%%/ccnet/client.pyo +%%PYTHON_SITELIBDIR%%/ccnet/errors.py +%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc +%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo +%%PYTHON_SITELIBDIR%%/ccnet/message.py +%%PYTHON_SITELIBDIR%%/ccnet/message.pyc +%%PYTHON_SITELIBDIR%%/ccnet/message.pyo +%%PYTHON_SITELIBDIR%%/ccnet/packet.py +%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc +%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo +%%PYTHON_SITELIBDIR%%/ccnet/pool.py +%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc +%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo +%%PYTHON_SITELIBDIR%%/ccnet/rpc.py +%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc +%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo +%%PYTHON_SITELIBDIR%%/ccnet/status_code.py +%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc +%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo +%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py +%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc +%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo +%%PYTHON_SITELIBDIR%%/ccnet/utils.py +%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc +%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo +libdata/pkgconfig/libccnet.pc +%%WWWDIR%%/seafile/bin/ccnet-init +%%WWWDIR%%/seafile/bin/ccnet-server |