diff options
author | Richard Gallamore <ultima@FreeBSD.org> | 2021-02-07 01:43:24 +0000 |
---|---|---|
committer | Richard Gallamore <ultima@FreeBSD.org> | 2021-02-07 01:43:24 +0000 |
commit | a76de0330101ad2c79aadccbc5ac0f15f2b092ca (patch) | |
tree | bed40fafb746309f954754703bec4a9d3ebdda7d /net-mgmt | |
parent | 9be904bbd0f59fa2996d9cb31f75c1f371329905 (diff) | |
download | ports-a76de0330101ad2c79aadccbc5ac0f15f2b092ca.tar.gz ports-a76de0330101ad2c79aadccbc5ac0f15f2b092ca.zip |
The upstream port that depended on this no longer requires it
and there are other dependant ports.
Notes
Notes:
svn path=/head/; revision=564584
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/Makefile | 1 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/Makefile | 75 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/distinfo | 3 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-Makefile.am | 15 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-configure.ac | 78 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-lib_Makefile.am | 10 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-lib_net.c | 14 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-lib_utils.c | 194 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/files/patch-net_common_getgateway.c | 11 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/pkg-descr | 7 | ||||
-rw-r--r-- | net-mgmt/ccnet-server/pkg-plist | 36 |
11 files changed, 0 insertions, 444 deletions
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index e885241c4fc7..4acdbc084cd5 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -32,7 +32,6 @@ SUBDIR += cacti88-spine SUBDIR += carbon-relay-ng SUBDIR += carbonzipper - SUBDIR += ccnet-server SUBDIR += cdpd SUBDIR += cdpr SUBDIR += cdpsnarf diff --git a/net-mgmt/ccnet-server/Makefile b/net-mgmt/ccnet-server/Makefile deleted file mode 100644 index a504a69e6a91..000000000000 --- a/net-mgmt/ccnet-server/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# $FreeBSD$ - -PORTNAME= ccnet-server -DISTVERSIONPREFIX= v -DISTVERSION= ${SEAFILE_VER} -DISTVERSIONSUFFIX= -server -CATEGORIES= net-mgmt devel - -MAINTAINER= ultima@FreeBSD.org -COMMENT= Internal communication framework for Seafile server - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -BUILD_DEPENDS= valac:lang/vala -LIB_DEPENDS= libsearpc.so:devel/libsearpc \ - libsqlite3.so:databases/sqlite3 \ - libzdb.so:databases/libzdb \ - libuuid.so:misc/e2fsprogs-libuuid \ - libevent.so:devel/libevent \ - libjansson.so:devel/jansson - -USES= autoreconf compiler:c11 gnome libtool localbase mysql:client \ - pathfix pgsql pkgconfig python:3.6+ shebangfix ssl -USE_GITHUB= yes -GH_ACCOUNT= haiwen -USE_GNOME= glib20 -USE_LDCONFIG= yes -USE_OPENLDAP= yes - -CONFLICTS= ccnet-[0-9]* - -CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl \ - -lcrypto" PKG_CONFIG_PATH="${WRKDIR}/pkgconfig" - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-ldap -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= NLS - -NLS_USES= gettext - -.include <bsd.port.pre.mk> - -_PKGCONFIGDIR= ${WRKDIR}/pkgconfig - -post-patch: - @${MKDIR} ${_PKGCONFIGDIR} -.if ${MYSQL_FLAVOUR} == mariadb -# If mariadb is the selected flavor, link the pc file as -# mysqlclient so PKG_CHECK_MODULES can find it. Mariadb -# doesn't supply this file in the same way other flavours do. - @${LN} -sf ${LOCALBASE}/libdata/pkgconfig/libmariadb.pc \ - ${_PKGCONFIGDIR}/mysqlclient.pc -.elif ${SSL_DEFAULT} == base -# Add bogus pc file to satisfy mysqlclient depend for ssl=base - @${PRINTF} 'Name:\nDescription:\nVersion:' \ - >${_PKGCONFIGDIR}/openssl.pc -.endif - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB} - ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${STAGEDIR}${PREFIX}/${SEABIN} - ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-server ${STAGEDIR}${PREFIX}/${SEABIN} - ${RM} ${STAGEDIR}${PREFIX}/bin/ccnet-init \ - ${STAGEDIR}${PREFIX}/bin/ccnet-server - (cd ${STAGEDIR}${PREFIX}/lib && \ - ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB}) - @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} - ${LN} -s '../${SEABIN}/ccnet-server' ${STAGEDIR}/${PREFIX}/bin/ccnet-server - -.include "${.CURDIR}/../seafile-server/Makefile.include" - -.include <bsd.port.post.mk> diff --git a/net-mgmt/ccnet-server/distinfo b/net-mgmt/ccnet-server/distinfo deleted file mode 100644 index 831b041279e4..000000000000 --- a/net-mgmt/ccnet-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1602650813 -SHA256 (haiwen-ccnet-server-v7.1.5-server_GH0.tar.gz) = 11e5281c239474756ed606bffe8f24c1089a3a9eb2502cfac7815d25ebc4585a -SIZE (haiwen-ccnet-server-v7.1.5-server_GH0.tar.gz) = 194783 diff --git a/net-mgmt/ccnet-server/files/patch-Makefile.am b/net-mgmt/ccnet-server/files/patch-Makefile.am deleted file mode 100644 index 283bf8703c1a..000000000000 --- a/net-mgmt/ccnet-server/files/patch-Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.am.orig 2016-10-05 10:33:03 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 diff --git a/net-mgmt/ccnet-server/files/patch-configure.ac b/net-mgmt/ccnet-server/files/patch-configure.ac deleted file mode 100644 index 9a44169f9934..000000000000 --- a/net-mgmt/ccnet-server/files/patch-configure.ac +++ /dev/null @@ -1,78 +0,0 @@ ---- configure.ac.orig 2016-10-05 10:33:03 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 -@@ -73,6 +81,7 @@ AM_CONDITIONAL([COMPILE_PYTHON], [test " - 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 -@@ -132,6 +141,7 @@ if test "$bwin32" = true; then - LIBS= - LIB_RESOLV= - LIB_UUID=-lrpcrt4 -+ LIB_KVM= - LIB_IPHLPAPI=-liphlpapi - LIB_SHELL32=-lshell32 - LIB_PSAPI=-lpsapi -@@ -144,11 +154,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= -@@ -156,6 +180,7 @@ else - LIB_INTL= - LIB_RESOLV=-lresolv - LIB_UUID=-luuid -+ LIB_KVM= - LIB_IPHLPAPI= - LIB_SHELL32= - LIB_PSAPI= -@@ -169,6 +194,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) diff --git a/net-mgmt/ccnet-server/files/patch-lib_Makefile.am b/net-mgmt/ccnet-server/files/patch-lib_Makefile.am deleted file mode 100644 index 7fcd64109bde..000000000000 --- a/net-mgmt/ccnet-server/files/patch-lib_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Makefile.am.orig 2016-10-20 15:27:27 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@ - - diff --git a/net-mgmt/ccnet-server/files/patch-lib_net.c b/net-mgmt/ccnet-server/files/patch-lib_net.c deleted file mode 100644 index 3664419fb2e7..000000000000 --- a/net-mgmt/ccnet-server/files/patch-lib_net.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/net.c.orig 2016-10-05 10:33:03 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; - } diff --git a/net-mgmt/ccnet-server/files/patch-lib_utils.c b/net-mgmt/ccnet-server/files/patch-lib_utils.c deleted file mode 100644 index 3b36b07e4b61..000000000000 --- a/net-mgmt/ccnet-server/files/patch-lib_utils.c +++ /dev/null @@ -1,194 +0,0 @@ ---- lib/utils.c.orig 2016-10-05 10:33:03 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) - { diff --git a/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c b/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c deleted file mode 100644 index aeb184a77f43..000000000000 --- a/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c +++ /dev/null @@ -1,11 +0,0 @@ ---- net/common/getgateway.c.orig 2016-10-05 10:33:03 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 diff --git a/net-mgmt/ccnet-server/pkg-descr b/net-mgmt/ccnet-server/pkg-descr deleted file mode 100644 index fd0ab0208817..000000000000 --- a/net-mgmt/ccnet-server/pkg-descr +++ /dev/null @@ -1,7 +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. In ccnet network, there are two types of -nodes, i.e., client and server. Server has the following functions, User -management, Group management. - -WWW: https://github.com/haiwen/ccnet-server diff --git a/net-mgmt/ccnet-server/pkg-plist b/net-mgmt/ccnet-server/pkg-plist deleted file mode 100644 index 14213118b95c..000000000000 --- a/net-mgmt/ccnet-server/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -bin/ccnet-server -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/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 -libdata/pkgconfig/libccnet.pc -%%SEAFILE_SERVER%%/seafile/bin/ccnet-init -%%SEAFILE_SERVER%%/seafile/bin/ccnet-server -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.py -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/rpc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/rpc.cpython-%%PYTHON_SUFFIX%%.pyc -%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.py -@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%% |