Date: Sun, 1 Mar 2015 17:19:47 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380214 - in head/net-mgmt/ccnet: . files Message-ID: <201503011719.t21HJlBK066764@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Mar 1 17:19:46 2015 New Revision: 380214 URL: https://svnweb.freebsd.org/changeset/ports/380214 QAT: https://qat.redports.org/buildarchive/r380214/ Log: net-mgmt/ccnet: Upgrade version 3.1.4 => 4.0.6 PR: 197979 Submitted by: maintainer (JingFeng Yan) Added: head/net-mgmt/ccnet/files/patch-Makefile.am (contents, props changed) Deleted: head/net-mgmt/ccnet/files/patch-makefile.am head/net-mgmt/ccnet/files/patch-net_common_processors_rcvcmd-proc.c head/net-mgmt/ccnet/files/patch-net_common_processors_service-proxy-proc.c head/net-mgmt/ccnet/files/patch-net_common_session.c Modified: head/net-mgmt/ccnet/Makefile head/net-mgmt/ccnet/distinfo head/net-mgmt/ccnet/files/patch-configure.ac head/net-mgmt/ccnet/files/patch-lib_Makefile.am head/net-mgmt/ccnet/files/patch-lib_net.c head/net-mgmt/ccnet/files/patch-lib_utils.c head/net-mgmt/ccnet/files/patch-net_common_getgateway.c Modified: head/net-mgmt/ccnet/Makefile ============================================================================== --- head/net-mgmt/ccnet/Makefile Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/Makefile Sun Mar 1 17:19:46 2015 (r380214) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= ccnet -PORTVERSION= 3.1.4 -PORTREVISION= 4 +PORTVERSION= 4.0.6 +PORTREVISION= 5 CATEGORIES= net-mgmt devel MAINTAINER= yan_jingfeng@yahoo.com @@ -23,8 +23,8 @@ LIB_DEPENDS= libsearpc.so:${PORTSDIR}/de USE_GITHUB= yes GH_ACCOUNT= haiwen -GH_TAGNAME= v3.1.4 -GH_COMMIT= 6b55658 +GH_TAGNAME= v${PORTVERSION}-server +GH_COMMIT= 1e1aeae USES= autoreconf libtool pkgconfig pathfix python:2 PATHFIX_MAKEFILEIN= Makefile.am Modified: head/net-mgmt/ccnet/distinfo ============================================================================== --- head/net-mgmt/ccnet/distinfo Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/distinfo Sun Mar 1 17:19:46 2015 (r380214) @@ -1,2 +1,2 @@ -SHA256 (ccnet-3.1.4.tar.gz) = 5838cff989fe1910aeda5a2801f331d479f76e7d2c00cb8d87f016a7e9b0ea8d -SIZE (ccnet-3.1.4.tar.gz) = 216920 +SHA256 (ccnet-4.0.6.tar.gz) = 4030d931c2aaad5d2d783c4afb2e2cda556a91307c26a378c91602540255b7eb +SIZE (ccnet-4.0.6.tar.gz) = 218569 Added: head/net-mgmt/ccnet/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/ccnet/files/patch-Makefile.am Sun Mar 1 17:19:46 2015 (r380214) @@ -0,0 +1,18 @@ +--- Makefile.am.orig 2015-01-27 22:28:22.000000000 -0500 ++++ Makefile.am 2015-01-27 22:33:35.000000000 -0500 +@@ -24,9 +24,13 @@ + install-data-local: + if MACOS + sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) ++else ++if BSD ++ sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles) + else + ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) + endif ++endif + + dist-hook: +- git log --format='%H' -1 > $(distdir)/latest_commit +\ No newline at end of file ++ git log --format='%H' -1 > $(distdir)/latest_commit Modified: head/net-mgmt/ccnet/files/patch-configure.ac ============================================================================== --- head/net-mgmt/ccnet/files/patch-configure.ac Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/files/patch-configure.ac Sun Mar 1 17:19:46 2015 (r380214) @@ -1,11 +1,78 @@ ---- 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= +--- configure.ac.orig 2014-12-03 21:47:39.000000000 -0500 ++++ configure.ac 2015-01-27 23:56:25.000000000 -0500 +@@ -51,8 +51,16 @@ + AC_MSG_RESULT(no) + fi + ++AC_MSG_CHECKING(for BSD) ++if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then ++ bbsd=true ++ AC_MSG_RESULT(compile in BSD) ++else ++ AC_MSG_RESULT(no) ++fi ++ + AC_MSG_CHECKING(for Linux) +-if test "$bmac" != "true" -a "$bwin32" != "true"; then ++if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then + blinux=true + AC_MSG_RESULT(compile in linux) + else +@@ -154,6 +162,7 @@ + AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) + AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) + AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) ++AM_CONDITIONAL([BSD], [test "$bbsd" = "true"]) + + + # check libraries +@@ -192,6 +201,7 @@ + LIBS= + LIB_RESOLV= + LIB_UUID=-lrpcrt4 ++ LIB_KVM= + LIB_IPHLPAPI=-liphlpapi + LIB_SHELL32=-lshell32 + LIB_PSAPI=-lpsapi +@@ -204,11 +214,25 @@ LIB_INTL= -- LIB_RESOLV=-lresolv + LIB_RESOLV=-lresolv + LIB_UUID= ++ LIB_KVM= + LIB_IPHLPAPI= + LIB_SHELL32= + LIB_PSAPI= + MSVC_CFLAGS= + LIB_DIRWATCH="-framework CoreServices" ++elif test "$bbsd" = true ; then ++ LIB_WS32= ++ LIB_GDI32= ++ LIB_RT= ++ LIB_INTL= + LIB_RESOLV= ++ LIB_UUID=-luuid ++ LIB_KVM=-lkvm ++ LIB_IPHLPAPI= ++ LIB_SHELL32= ++ LIB_PSAPI= ++ MSVC_CFLAGS= ++ LIB_DIRWATCH= + else + LIB_WS32= + LIB_GDI32= +@@ -216,6 +240,7 @@ + LIB_INTL= + LIB_RESOLV=-lresolv LIB_UUID=-luuid ++ LIB_KVM= LIB_IPHLPAPI= LIB_SHELL32= + LIB_PSAPI= +@@ -229,6 +254,7 @@ + AC_SUBST(LIB_INTL) + AC_SUBST(LIB_RESOLV) + AC_SUBST(LIB_UUID) ++AC_SUBST(LIB_KVM) + AC_SUBST(LIB_IPHLPAPI) + AC_SUBST(LIB_SHELL32) + AC_SUBST(LIB_PSAPI) Modified: head/net-mgmt/ccnet/files/patch-lib_Makefile.am ============================================================================== --- head/net-mgmt/ccnet/files/patch-lib_Makefile.am Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/files/patch-lib_Makefile.am Sun Mar 1 17:19:46 2015 (r380214) @@ -1,55 +1,10 @@ ---- lib/Makefile.am.orig 2014-11-11 10:10:39.971972968 -0500 -+++ lib/Makefile.am 2014-11-11 10:37:36.712929368 -0500 -@@ -19,7 +19,6 @@ - peer-common.h \ - string-util.h \ - libccnet_utils.h \ -- ccnet-object.h \ - rpc-common.h \ - net.h \ - utils.h \ -@@ -60,12 +59,14 @@ - +--- lib/Makefile.am.orig 2015-01-27 22:48:22.000000000 -0500 ++++ lib/Makefile.am 2015-01-27 22:49:06.000000000 -0500 +@@ -61,6 +61,7 @@ libccnetd_la_LDFLAGS = -no-undefined libccnetd_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_GDI32@ \ -- -lsqlite3 -levent @LIB_WS32@ @LIB_UUID@ \ -+ -lsqlite3 -levent @LIB_WS32@ @LIB_UUID@ -lkvm \ + -lsqlite3 @LIBEVENT_LIBS@ @LIB_WS32@ @LIB_UUID@ \ ++ @LIB_KVM@ \ @LIB_SHELL32@ @LIB_PSAPI@ @SEARPC_LIBS@ - 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} Modified: head/net-mgmt/ccnet/files/patch-lib_net.c ============================================================================== --- head/net-mgmt/ccnet/files/patch-lib_net.c Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/files/patch-lib_net.c Sun Mar 1 17:19:46 2015 (r380214) @@ -1,11 +1,14 @@ ---- 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 @@ +--- lib/net.c.orig 2015-01-27 23:18:59.000000000 -0500 ++++ lib/net.c 2015-01-27 23:23:04.000000000 -0500 +@@ -152,7 +152,11 @@ snprintf (buf, sizeof(buf), "%d", port); -- if ( (n = getaddrinfo(NULL, buf, &hints, &res) ) != 0) { ++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + if ( (n = getaddrinfo("0.0.0.0", buf, &hints, &res) ) != 0) { ++#else + if ( (n = getaddrinfo(NULL, buf, &hints, &res) ) != 0) { ++#endif ccnet_warning ("getaddrinfo fails: %s\n", gai_strerror(n)); return -1; } Modified: head/net-mgmt/ccnet/files/patch-lib_utils.c ============================================================================== --- head/net-mgmt/ccnet/files/patch-lib_utils.c Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/files/patch-lib_utils.c Sun Mar 1 17:19:46 2015 (r380214) @@ -1,5 +1,5 @@ ---- lib/utils.c.orig 2014-07-31 06:20:28.000000000 -0400 -+++ lib/utils.c 2014-11-21 23:06:33.789257323 -0500 +--- lib/utils.c.orig 2015-01-27 23:13:50.000000000 -0500 ++++ lib/utils.c 2015-01-27 23:18:04.000000000 -0500 @@ -43,6 +43,16 @@ #include <event2/util.h> @@ -17,11 +17,12 @@ extern int inet_pton(int af, const char *src, void *dst); -@@ -1465,14 +1475,19 @@ +@@ -1465,14 +1475,20 @@ } #endif /* ifdef WIN32 */ -#ifdef __linux__ ++ /* 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) @@ -39,7 +40,7 @@ return -1; } -@@ -1496,7 +1511,8 @@ +@@ -1496,7 +1512,8 @@ } /* read the /proc fs to determine whether some process is running */ @@ -49,7 +50,7 @@ { DIR *proc_dir = opendir("/proc"); if (!proc_dir) { -@@ -1510,7 +1526,7 @@ +@@ -1510,7 +1527,7 @@ /* /proc/[1-9][0-9]* */ if (first > '9' || first < '1') continue; @@ -58,7 +59,7 @@ if (pid > 0) { closedir(proc_dir); return TRUE; -@@ -1520,6 +1536,18 @@ +@@ -1520,6 +1537,18 @@ closedir(proc_dir); return FALSE; } @@ -77,7 +78,7 @@ #endif #ifdef __APPLE__ -@@ -1530,6 +1558,108 @@ +@@ -1530,6 +1559,108 @@ } #endif Modified: head/net-mgmt/ccnet/files/patch-net_common_getgateway.c ============================================================================== --- head/net-mgmt/ccnet/files/patch-net_common_getgateway.c Sun Mar 1 17:07:38 2015 (r380213) +++ head/net-mgmt/ccnet/files/patch-net_common_getgateway.c Sun Mar 1 17:19:46 2015 (r380214) @@ -1,5 +1,5 @@ ---- 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 +--- net/common/getgateway.c.orig 2015-01-27 23:26:41.000000000 -0500 ++++ net/common/getgateway.c 2015-01-27 23:27:58.000000000 -0500 @@ -34,7 +34,7 @@ #undef USE_SYSCTL_NET_ROUTE #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503011719.t21HJlBK066764>