FreeBSD Bugzilla – Attachment 147549 Details for
Bug 193133
[NEW PORT] www/ccnet: Framework for writing networked applications
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
for updated mk
ccnet.shar (text/plain), 13.62 KB, created by
Jingfeng Yan
on 2014-09-22 03:12:05 UTC
(
hide
)
Description:
for updated mk
Filename:
MIME Type:
Creator:
Jingfeng Yan
Created:
2014-09-22 03:12:05 UTC
Size:
13.62 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># ccnet ># ccnet/distinfo ># ccnet/Makefile ># ccnet/pkg-plist ># ccnet/files ># ccnet/files/patch-configure.ac ># ccnet/files/patch-net_common_processors_service-proxy-proc.c ># ccnet/files/patch-lib_net.c ># ccnet/files/patch-makefile.am ># ccnet/files/patch-lib_utils.c ># ccnet/files/patch-net_common_session.c ># ccnet/files/patch-lib_Makefile.am ># ccnet/files/patch-net_common_processors_rcvcmd-proc.c ># ccnet/files/patch-net_common_getgateway.c ># ccnet/pkg-descr ># >echo c - ccnet >mkdir -p ccnet > /dev/null 2>&1 >echo x - ccnet/distinfo >sed 's/^X//' >ccnet/distinfo << '76a186b4d98d2618f09bd30b503528c3' >XSHA256 (ccnet-3.1.4.tar.gz) = 5838cff989fe1910aeda5a2801f331d479f76e7d2c00cb8d87f016a7e9b0ea8d >XSIZE (ccnet-3.1.4.tar.gz) = 216920 >76a186b4d98d2618f09bd30b503528c3 >echo x - ccnet/Makefile >sed 's/^X//' >ccnet/Makefile << 'f7c8bd960a5315a430c670df31e7b1c4' >X# $FreeBSD$ >X >XPORTNAME= ccnet >XPORTVERSION= 3.1.4 >XCATEGORIES= www >X >XMAINTAINER= yan_jingfeng@yahoo.com >XCOMMENT= Framework for writing networked applications >X >XLICENSE= GPLv3 >X >XBUILD_DEPENDS= valac:${PORTSDIR}/lang/vala >XLIB_DEPENDS= libsearpc.so:${PORTSDIR}/www/libsearpc \ >X libcrypto.so:${PORTSDIR}/security/openssl \ >X libglib-2.0.so:${PORTSDIR}/devel/glib20 \ >X libgobject-2.0.so:${PORTSDIR}/devel/glib20 \ >X libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ >X libzdb.so:${PORTSDIR}/databases/libzdb \ >X libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ >X libevent.so:${PORTSDIR}/devel/libevent2 \ >X libjansson.so:${PORTSDIR}/devel/jansson >X >XUSE_GITHUB= yes >XGH_ACCOUNT= haiwen >XGH_TAGNAME= v3.1.4 >XGH_COMMIT= 6b55658 >X >XUSES= autoreconf libtool pathfix pkgconfig python:2 >XUSE_LDCONFIG= yes >XPATHFIX_MAKEFILEIN= Makefile.am >X >XCPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/event2 >XLDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2 >XGNU_CONFIGURE= yes >XCONFIGURE_ARGS+=--enable-server >XINSTALL_TARGET= install-strip >X >XWITH_OPENSSL_PORT= yes >XUSE_OPENSSL= yes >X >XWWWDIR= ${PREFIX}/www/haiwen/seafile-server >X >Xpost-install: >X @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}/seafile/bin >X @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/ccnet-init \ >X ${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-init >X @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/bin/ccnet-server \ >X ${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-server >X >X.include <bsd.port.mk> >f7c8bd960a5315a430c670df31e7b1c4 >echo x - ccnet/pkg-plist >sed 's/^X//' >ccnet/pkg-plist << '79ce46034e4ec14e8d81f773f4178195' >Xbin/ccnet >Xbin/ccnet-demo-client >Xbin/ccnet-demo-server >Xbin/ccnet-init >Xbin/ccnet-server >Xbin/ccnet-servtool >Xbin/ccnet-tool >Xinclude/ccnet.h >Xinclude/ccnet/async-rpc-proc.h >Xinclude/ccnet/ccnet-client.h >Xinclude/ccnet/ccnet-object.h >Xinclude/ccnet/ccnet-session-base.h >Xinclude/ccnet/ccnetrpc-transport.h >Xinclude/ccnet/cevent.h >Xinclude/ccnet/invoke-service-proc.h >Xinclude/ccnet/job-mgr.h >Xinclude/ccnet/message.h >Xinclude/ccnet/mqclient-proc.h >Xinclude/ccnet/option.h >Xinclude/ccnet/packet.h >Xinclude/ccnet/peer.h >Xinclude/ccnet/proc-factory.h >Xinclude/ccnet/processor.h >Xinclude/ccnet/rpcserver-proc.h >Xinclude/ccnet/sendcmd-proc.h >Xinclude/ccnet/status-code.h >Xinclude/ccnet/threaded-rpcserver-proc.h >Xinclude/ccnet/timer.h >Xinclude/ccnet/valid-check.h >Xlib/libccnet.a >Xlib/libccnet.so >Xlib/libccnet.so.0 >Xlib/libccnet.so.0.0.0 >X%%PYTHON_SITELIBDIR%%/ccnet/__init__.py >X%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py >X%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/client.py >X%%PYTHON_SITELIBDIR%%/ccnet/client.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/client.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/errors.py >X%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/message.py >X%%PYTHON_SITELIBDIR%%/ccnet/message.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/message.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/packet.py >X%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/pool.py >X%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/rpc.py >X%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/status_code.py >X%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py >X%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo >X%%PYTHON_SITELIBDIR%%/ccnet/utils.py >X%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc >X%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo >Xlibdata/pkgconfig/libccnet.pc >X%%WWWDIR%%/seafile/bin/ccnet-init >X%%WWWDIR%%/seafile/bin/ccnet-server >X@dirrmtry include/ccnet >X@dirrmtry %%PYTHON_SITELIBDIR%%/ccnet/async >X@dirrmtry %%PYTHON_SITELIBDIR%%/ccnet >X@dirrmtry %%WWWDIR%%/seafile/bin >X@dirrmtry %%WWWDIR%%/seafile >X@dirrmtry %%WWWDIR%% >X@dirrmtry www/haiwen >79ce46034e4ec14e8d81f773f4178195 >echo c - ccnet/files >mkdir -p ccnet/files > /dev/null 2>&1 >echo x - ccnet/files/patch-configure.ac >sed 's/^X//' >ccnet/files/patch-configure.ac << 'fd033e57d1eded388faa837b8857465f' >X--- configure.ac.orig 2014-06-10 04:41:45.000000000 -0400 >X+++ configure.ac 2014-08-26 18:17:12.161128916 -0400 >X@@ -218,7 +218,7 @@ >X LIB_GDI32= >X LIB_RT= >X LIB_INTL= >X- LIB_RESOLV=-lresolv >X+ LIB_RESOLV= >X LIB_UUID=-luuid >X LIB_IPHLPAPI= >X LIB_SHELL32= >fd033e57d1eded388faa837b8857465f >echo x - ccnet/files/patch-net_common_processors_service-proxy-proc.c >sed 's/^X//' >ccnet/files/patch-net_common_processors_service-proxy-proc.c << '709fe510e04c5d8ad5c296f0df52e1f0' >X--- net/common/processors/service-proxy-proc.c.orig 2014-09-02 15:47:22.827928455 -0400 >X+++ net/common/processors/service-proxy-proc.c 2014-09-02 15:47:36.619949159 -0400 >X@@ -43,7 +43,7 @@ >X { >X ServiceProxyPriv *priv = GET_PRIV(processor); >X if (priv->name) { >X- free (priv->name); >X+ g_free (priv->name); >X priv->name = NULL; >X } >X >709fe510e04c5d8ad5c296f0df52e1f0 >echo x - ccnet/files/patch-lib_net.c >sed 's/^X//' >ccnet/files/patch-lib_net.c << '85a490068deed9109fc550ec7d42c164' >X--- lib/net.c.orig 2014-09-02 21:06:10.181095833 -0400 >X+++ lib/net.c 2014-09-02 21:06:40.052390263 -0400 >X@@ -154,7 +154,7 @@ >X >X snprintf (buf, sizeof(buf), "%d", port); >X >X- if ( (n = getaddrinfo(NULL, buf, &hints, &res) ) != 0) { >X+ if ( (n = getaddrinfo("0.0.0.0", buf, &hints, &res) ) != 0) { >X ccnet_warning ("getaddrinfo fails: %s\n", gai_strerror(n)); >X return -1; >X } >85a490068deed9109fc550ec7d42c164 >echo x - ccnet/files/patch-makefile.am >sed 's/^X//' >ccnet/files/patch-makefile.am << '4898ba33d75ecf9a989265bad83a2d39' >X--- Makefile.am.orig 2014-07-21 07:24:46.000000000 -0400 >X+++ Makefile.am 2014-07-21 07:25:02.000000000 -0400 >X@@ -22,11 +22,7 @@ >X ACLOCAL_AMFLAGS = -I m4 >X >X install-data-local: >X-if MACOS >X- sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) >X-else >X- sed -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) >X-endif >X+ sed -i '' "s|(DESTDIR)||g" $(pcfiles) >X >X dist-hook: >X- git log --format='%H' -1 > $(distdir)/latest_commit >X\ No newline at end of file >X+ git log --format='%H' -1 > $(distdir)/latest_commit >4898ba33d75ecf9a989265bad83a2d39 >echo x - ccnet/files/patch-lib_utils.c >sed 's/^X//' >ccnet/files/patch-lib_utils.c << '5671f7b96d48ff913bd6003cced9c9b3' >X--- lib/utils.c.orig 2014-06-10 04:41:45.000000000 -0400 >X+++ lib/utils.c 2014-07-28 14:32:24.000000000 -0400 >X@@ -41,6 +41,10 @@ >X #include <glib/gstdio.h> >X #include <searpc-utils.h> >X >X+#ifdef __FreeBSD__ >X+#include <netinet/in.h> >X+#endif >X+ >X extern int inet_pton(int af, const char *src, void *dst); >X >X >X@@ -1463,14 +1467,19 @@ >X } >X #endif /* ifdef WIN32 */ >X >X-#ifdef __linux__ >X+#if defined(__linux__) || defined(__FreeBSD__) >X /* read the link of /proc/123/exe and compare with `process_name' */ >X static int >X find_process_in_dirent(struct dirent *dir, const char *process_name) >X { >X char path[512]; >X /* fisrst construct a path like /proc/123/exe */ >X+#if defined(__linux__) >X if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) { >X+#endif >X+#if defined(__FreeBSD__) >X+ if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) { >X+#endif >X return -1; >X } >X >X@@ -1528,6 +1537,22 @@ >X } >X #endif >X >X+/* >X+ * Finally, we should not enforce to use /proc >X+#ifdef __FreeBSD__ >X+gboolean process_is_running (const char *process_name) >X+{ >X+ //TODO >X+ return FALSE; >X+} >X+ >X+int count_process(const char *process_name) >X+{ >X+ return 0; >X+} >X+#endif >X+*/ >X+ >X char* >X ccnet_object_type_from_id (const char *object_id) >X { >5671f7b96d48ff913bd6003cced9c9b3 >echo x - ccnet/files/patch-net_common_session.c >sed 's/^X//' >ccnet/files/patch-net_common_session.c << '4e315f7b6873c6baee0eb0708bc9fb65' >X--- net/common/session.c.orig 2014-09-03 04:04:21.072122386 -0400 >X+++ net/common/session.c 2014-09-03 04:04:58.071390609 -0400 >X@@ -168,6 +168,7 @@ >X g_free (name); >X g_free (user_name); >X g_free (port_str); >X+ g_free (lport_str); >X #ifdef CCNET_SERVER >X g_free (service_url); >X #endif >4e315f7b6873c6baee0eb0708bc9fb65 >echo x - ccnet/files/patch-lib_Makefile.am >sed 's/^X//' >ccnet/files/patch-lib_Makefile.am << '9c568af5b0e74dcb789596253f67b248' >X--- lib/Makefile.am.orig 2014-07-31 06:20:28.000000000 -0400 >X+++ lib/Makefile.am 2014-09-02 13:48:35.659991963 -0400 >X@@ -19,7 +19,6 @@ >X peer-common.h \ >X string-util.h \ >X libccnet_utils.h \ >X- ccnet-object.h \ >X rpc-common.h \ >X net.h \ >X utils.h \ >X@@ -66,6 +65,8 @@ >X >X ccnet_object_define = ccnetobj.vala >X >X+valac_gen = ccnetobj.c ccnet-object.h >X+ >X ccnet-client.c: ccnet-object.h >X >X ccnet-object.h: ${ccnet_object_define} >X@@ -78,15 +79,23 @@ >X >X searpc_gen = searpc-signature.h searpc-marshal.h >X >X-gensource: ${searpc_gen} >X+gensource: ${searpc_gen} ${valac_gen} >X >X-${searpc_gen}: $(top_srcdir)/lib/rpc_table.py >X+rpc_table.stamp: ${top_srcdir}/lib/rpc_table.py >X+ @rm -f rpc_table.tmp >X+ @touch rpc_table.tmp >X @echo "[libsearpc]: generating rpc header files" >X- @PYTHON@ `which searpc-codegen.py` $(top_srcdir)/lib/rpc_table.py >X+ @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py >X @echo "[libsearpc]: done" >X+ @mv -f rpc_table.tmp $@ >X+ >X+${searpc_gen}: rpc_table.stamp >X >X clean-local: >X rm -f ${searpc_gen} >X- rm -f $(top_srcdir)/lib/rpc_table.pyc >X+ rm -f rpc_table.pyc >X+ rm -f rpc_table.stamp >X+ rm -f rpc_table.tmp >X+ rm -f ${valac_gen} >X >X-CLEANFILES = ${searpc_gen} >X+CLEANFILES = ${searpc_gen} ${valac_gen} >9c568af5b0e74dcb789596253f67b248 >echo x - ccnet/files/patch-net_common_processors_rcvcmd-proc.c >sed 's/^X//' >ccnet/files/patch-net_common_processors_rcvcmd-proc.c << 'cbf7987e8487ef5ba67b72869167cfcb' >X--- net/common/processors/rcvcmd-proc.c.orig 2014-09-02 15:49:07.244090539 -0400 >X+++ net/common/processors/rcvcmd-proc.c 2014-09-02 15:52:55.749963338 -0400 >X@@ -221,7 +221,7 @@ >X int i; >X >X commands = g_strsplit_set (line, " \t", 10); >X- for (i=0, pcmd = commands; *pcmd; pcmd++) >X+ for (i = 0, pcmd = commands; *pcmd; pcmd++) >X i++; >X >X if (i == 0) { >X@@ -234,7 +234,6 @@ >X if (c == NULL) { >X ccnet_processor_send_response (processor, SC_UNKNONW_CMD, >X SS_UNKNONW_CMD, NULL, 0); >X- return; >X } else >X c->handler (processor, i, commands); >X >X@@ -534,7 +533,7 @@ >X ret = -1; >X >X out: >X- g_free (addr); >X+ g_free (addr_port); >X g_free (role); >X g_free (peer_id); >X if (peer) g_object_unref (peer); >X@@ -707,6 +706,7 @@ >X if (addr_port) { >X peer = ccnet_peer_manager_add_resolve_peer ( >X processor->session->peer_mgr, addr, port); >X+ g_free (peer->intend_role); >X peer->intend_role = g_strdup(role); >X ccnet_processor_send_response (processor, SC_OK, SS_OK, NULL, 0); >X ret = 0; >X@@ -736,7 +736,7 @@ >X ret = -1; >X >X out: >X- g_free (addr); >X+ g_free (addr_port); >X g_free (role); >X g_free (peer_id); >X if (peer) g_object_unref (peer); >cbf7987e8487ef5ba67b72869167cfcb >echo x - ccnet/files/patch-net_common_getgateway.c >sed 's/^X//' >ccnet/files/patch-net_common_getgateway.c << '02f19081ce1a54d8d9f083df37908890' >X--- net/common/getgateway.c.orig 2014-07-28 14:30:13.000000000 -0400 >X+++ net/common/getgateway.c 2014-07-28 14:30:29.000000000 -0400 >X@@ -34,7 +34,7 @@ >X #undef USE_SYSCTL_NET_ROUTE >X #endif >X >X-#ifdef BSD >X+#ifdef __FreeBSD__ >X #undef USE_PROC_NET_ROUTE >X #define USE_SOCKET_ROUTE >X #undef USE_SYSCTL_NET_ROUTE >02f19081ce1a54d8d9f083df37908890 >echo x - ccnet/pkg-descr >sed 's/^X//' >ccnet/pkg-descr << '2f7ed18c9f4efb27392659ffc28131fc' >2f7ed18c9f4efb27392659ffc28131fc >exit >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 193133
:
146502
|
146503
|
146793
|
146925
|
146927
|
146930
|
147549
|
148938
|
148940
|
148941
|
148967
|
148968
|
148969
|
148973
|
148974
|
148976