Removed net-mgmt/ccnet-client, this port has no

more dependencies and has been abandoned upstream.
This commit is contained in:
Richard Gallamore 2019-06-10 08:14:48 +00:00
parent fafa33e5fc
commit af2fa44ccd
13 changed files with 1 additions and 465 deletions

1
MOVED
View file

@ -12789,3 +12789,4 @@ www/pivotx||2019-05-31|Has expired: inactive upstream and does not work with PHP
dns/bind912|dns/bind914|2019-05-31|Has expired: Support ends, please move to dns/bind914.
multimedia/vdr-plugin-softhddevice||2019-05-31|Has expired: unmaintained and depends on vulnerable multimedia/ffmpeg0
devel/pecl-pthreads||2019-06-02|Has expired: Does not work with recent versions of php
net-mgmt/ccnet-client||2019-06-10|Removed, no longer has dependencies and has been abandoned upstream

View file

@ -32,7 +32,6 @@
SUBDIR += cacti88-spine
SUBDIR += carbon-relay-ng
SUBDIR += carbonzipper
SUBDIR += ccnet-client
SUBDIR += ccnet-server
SUBDIR += cdpd
SUBDIR += cdpr

View file

@ -1,42 +0,0 @@
# $FreeBSD$
PORTNAME= ccnet-client
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAFILE_CLIENT_VER}
CATEGORIES= net-mgmt devel
MAINTAINER= ultima@FreeBSD.org
COMMENT= Framework for writing networked applications
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libsqlite3.so:databases/sqlite3 \
libuuid.so:misc/e2fsprogs-libuuid \
libevent.so:devel/libevent \
libjansson.so:devel/jansson
USES= autoreconf libtool localbase pathfix pkgconfig \
python:-2.7 ssl
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_OPENLDAP= yes
USE_GITHUB= yes
GH_ACCOUNT= haiwen
GH_PROJECT= ccnet
CONFLICTS= ccnet-server-[0-9]*
CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= NLS
NLS_USES= gettext
.include "${.CURDIR}/../seafile-client/Makefile.include"
.include <bsd.port.mk>

View file

@ -1,3 +0,0 @@
TIMESTAMP = 1517595652
SHA256 (haiwen-ccnet-v6.1.5_GH0.tar.gz) = 763296486f8cc51b439355e87dac8cb71975689024bddb359b0456aa8dbd518f
SIZE (haiwen-ccnet-v6.1.5_GH0.tar.gz) = 179334

View file

@ -1,15 +0,0 @@
--- Makefile.am.orig 2017-01-15 15:09:00 UTC
+++ Makefile.am
@@ -15,8 +15,12 @@ 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

View file

@ -1,78 +0,0 @@
--- configure.ac.orig 2017-01-05 06:13:46 UTC
+++ configure.ac
@@ -52,8 +52,16 @@ else
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
@@ -63,6 +71,7 @@ fi
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
@@ -122,6 +131,7 @@ if test "$bwin32" = true; then
LIBS=
LIB_RESOLV=
LIB_UUID=-lrpcrt4
+ LIB_KVM=
LIB_IPHLPAPI=-liphlpapi
LIB_SHELL32=-lshell32
LIB_PSAPI=-lpsapi
@@ -134,11 +144,25 @@ elif test "$bmac" = true ; then
LIB_INTL=
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=
@@ -146,6 +170,7 @@ else
LIB_INTL=
LIB_RESOLV=-lresolv
LIB_UUID=-luuid
+ LIB_KVM=
LIB_IPHLPAPI=
LIB_SHELL32=
LIB_PSAPI=
@@ -159,6 +184,7 @@ AC_SUBST(LIB_RT)
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)

View file

@ -1,10 +0,0 @@
--- lib/Makefile.am.orig 2015-11-26 15:34:14 UTC
+++ lib/Makefile.am
@@ -61,6 +61,7 @@ libccnetd_la_SOURCES = utils.c db.c job-
libccnetd_la_LDFLAGS = -no-undefined
libccnetd_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_GDI32@ \
-lsqlite3 @LIBEVENT_LIBS@ @LIB_WS32@ @LIB_UUID@ \
+ @LIB_KVM@ \
@LIB_SHELL32@ @LIB_PSAPI@ @SEARPC_LIBS@

View file

@ -1,14 +0,0 @@
--- lib/net.c.orig 2015-11-11 09:50:52 UTC
+++ lib/net.c
@@ -152,7 +152,11 @@ ccnet_net_bind_tcp (int port, int nonblo
snprintf (buf, sizeof(buf), "%d", port);
+#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;
}

View file

@ -1,11 +0,0 @@
--- lib/rsa.c.orig 2017-07-02 22:29:20 UTC
+++ lib/rsa.c
@@ -13,7 +13,7 @@
/* Forward compatibility functions if libssl < 1.1.0. */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
{

View file

@ -1,194 +0,0 @@
--- lib/utils.c.orig 2016-01-08 11:43:49 UTC
+++ lib/utils.c
@@ -43,6 +43,16 @@
#include <event2/util.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#include <netinet/in.h>
+#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);
@@ -1469,14 +1479,20 @@ get_argv_utf8 (int *argc)
}
#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)
+find_process_in_dirent_procfs(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) {
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) {
+#else
+ if (1) {
+#endif
return -1;
}
@@ -1500,7 +1516,8 @@ find_process_in_dirent(struct dirent *di
}
/* 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) {
@@ -1514,7 +1531,7 @@ gboolean process_is_running (const char
/* /proc/[1-9][0-9]* */
if (first > '9' || first < '1')
continue;
- int pid = find_process_in_dirent(subdir, process_name);
+ int pid = find_process_in_dirent_procfs(subdir, process_name);
if (pid > 0) {
closedir(proc_dir);
return TRUE;
@@ -1524,6 +1541,18 @@ gboolean process_is_running (const char
closedir(proc_dir);
return FALSE;
}
+
+#ifdef __linux__
+static int
+find_process_in_dirent(struct dirent *dir, const char *process_name)
+{
+ return find_process_in_dirent_procfs(dir, process_name);
+}
+
+gboolean
+process_is_running (const char *process_name) {
+ return process_is_running_procfs(process_name);
+}
#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) \
+ kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc)
+
+#elif defined(__DragonFly__)
+#define PSKIP(kp) ((kp)->kp_pid == mypid || \
+ (!kthreads && ((kp)->kp_flags & P_SYSTEM) != 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
+
+#define WITH_PROC_FS g_file_test("/proc/curproc", G_FILE_TEST_EXISTS)
+
+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;
+ }
+}
+#endif
+
char*
ccnet_object_type_from_id (const char *object_id)
{

View file

@ -1,11 +0,0 @@
--- net/common/getgateway.c.orig 2015-11-11 09:50:52 UTC
+++ net/common/getgateway.c
@@ -34,7 +34,7 @@
#undef USE_SYSCTL_NET_ROUTE
#endif
-#ifdef BSD
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
#undef USE_PROC_NET_ROUTE
#define USE_SOCKET_ROUTE
#undef USE_SYSCTL_NET_ROUTE

View file

@ -1,6 +0,0 @@
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

View file

@ -1,80 +0,0 @@
bin/ccnet
bin/ccnet-init
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