Date: Mon, 10 Jun 2019 07:51:26 +0000 (UTC) From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503877 - in head/net-mgmt/seafile-client: . files Message-ID: <201906100751.x5A7pQcE049246@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Mon Jun 10 07:51:26 2019 New Revision: 503877 URL: https://svnweb.freebsd.org/changeset/ports/503877 Log: Updated to 7.0.1 Port cleanup, ccnet-client will be deleted in the future. Changes: https://manual.seafile.com/changelog/client-changelog.html Deleted: head/net-mgmt/seafile-client/Makefile.include Modified: head/net-mgmt/seafile-client/Makefile head/net-mgmt/seafile-client/distinfo head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am head/net-mgmt/seafile-client/files/patch-daemon_http-tx-mgr.c head/net-mgmt/seafile-client/files/patch-lib_Makefile.am head/net-mgmt/seafile-client/files/patch-lib_utils.c Modified: head/net-mgmt/seafile-client/Makefile ============================================================================== --- head/net-mgmt/seafile-client/Makefile Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/Makefile Mon Jun 10 07:51:26 2019 (r503877) @@ -2,7 +2,7 @@ PORTNAME= seafile-client DISTVERSIONPREFIX= v -DISTVERSION= ${SEAFILE_CLIENT_VER} +DISTVERSION= 7.0.1 CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org @@ -15,7 +15,6 @@ BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libcurl.so:ftp/curl \ libinotify.so:devel/libinotify \ - libccnet.so:net-mgmt/ccnet-client \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson @@ -23,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:database ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash -USES= autoreconf gnome iconv libarchive libtool localbase mysql \ +USES= autoreconf gnome iconv libarchive libtool localbase \ pathfix pkgconfig python:-2.7 shebangfix sqlite ssl USE_GITHUB= yes GH_ACCOUNT= haiwen @@ -49,12 +48,5 @@ NLS_USES= gettext post-patch: # Fix P_KTHREAD r295435 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c - -makesum-all: -.for PORT in net-mgmt/ccnet-client net-mgmt/seafile-client net-mgmt/seafile-gui - ${MAKE} -C "${PORTSDIR}/${PORT}" makesum -.endfor - -.include "${.CURDIR}/Makefile.include" .include <bsd.port.mk> Modified: head/net-mgmt/seafile-client/distinfo ============================================================================== --- head/net-mgmt/seafile-client/distinfo Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/distinfo Mon Jun 10 07:51:26 2019 (r503877) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517595653 -SHA256 (haiwen-seafile-v6.1.5_GH0.tar.gz) = 19f9ccd515af8b4dc422479dfdc69ab3a55978751ed25653e0f5d04196949f6a -SIZE (haiwen-seafile-v6.1.5_GH0.tar.gz) = 824318 +TIMESTAMP = 1560130395 +SHA256 (haiwen-seafile-v7.0.1_GH0.tar.gz) = 9bb14fc24830e62eff3f99dc7324a2d66acec95a73f6d12de3950d0a64ab668e +SIZE (haiwen-seafile-v7.0.1_GH0.tar.gz) = 698053 Modified: head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am ============================================================================== --- head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am Mon Jun 10 07:51:26 2019 (r503877) @@ -1,6 +1,6 @@ ---- daemon/Makefile.am.orig 2017-01-15 15:47:19 UTC +--- daemon/Makefile.am.orig 2019-06-10 01:56:16 UTC +++ daemon/Makefile.am -@@ -61,6 +61,10 @@ if LINUX +@@ -37,6 +37,10 @@ if LINUX wt_monitor_src = wt-monitor.c wt-monitor-linux.c wt-monitor-structs.c endif @@ -11,12 +11,12 @@ if WIN32 wt_monitor_src = wt-monitor.c wt-monitor-win32.c wt-monitor-structs.c endif -@@ -124,6 +128,7 @@ seaf_daemon_LDADD = $(top_builddir)/lib/ +@@ -78,6 +82,7 @@ seaf_daemon_LDADD = $(top_builddir)/lib/libseafile_com @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ \ $(top_builddir)/common/cdc/libcdc.la \ $(top_builddir)/common/index/libindex.la @LIB_WS32@ @LIB_CRYPT32@ \ -- @SEARPC_LIBS@ @CCNET_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @BPWRAPPER_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ \ -+ @ZLIB_LIBS@ @CURL_LIBS@ @LIB_INOTIFY@ @BPWRAPPER_LIBS@ +- @SEARPC_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @BPWRAPPER_LIBS@ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ \ ++ @CURL_LIBS@ @LIB_INOTIFY@ @BPWRAPPER_LIBS@ seaf_daemon_LDFLAGS = @CONSOLE@ Modified: head/net-mgmt/seafile-client/files/patch-daemon_http-tx-mgr.c ============================================================================== --- head/net-mgmt/seafile-client/files/patch-daemon_http-tx-mgr.c Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/files/patch-daemon_http-tx-mgr.c Mon Jun 10 07:51:26 2019 (r503877) @@ -1,6 +1,6 @@ ---- daemon/http-tx-mgr.c.orig 2018-02-02 05:55:07 UTC +--- daemon/http-tx-mgr.c.orig 2019-06-04 02:14:53 UTC +++ daemon/http-tx-mgr.c -@@ -68,6 +68,22 @@ +@@ -69,6 +69,22 @@ #define USER_AGENT_OS "BSD" #endif @@ -23,13 +23,3 @@ struct _Connection { CURL *curl; gint64 ctime; /* Used to clean up unused connection. */ -@@ -1091,7 +1107,9 @@ curl_error_to_http_task_error (int curl_ - case CURLE_SSL_CONNECT_ERROR: - case CURLE_PEER_FAILED_VERIFICATION: - case CURLE_SSL_CERTPROBLEM: -+#if LIBCURL_VERSION_NUM < 0x073e00 - case CURLE_SSL_CACERT: -+#endif - case CURLE_SSL_CACERT_BADFILE: - case CURLE_SSL_ISSUER_ERROR: - return HTTP_TASK_ERR_SSL; Modified: head/net-mgmt/seafile-client/files/patch-lib_Makefile.am ============================================================================== --- head/net-mgmt/seafile-client/files/patch-lib_Makefile.am Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/files/patch-lib_Makefile.am Mon Jun 10 07:51:26 2019 (r503877) @@ -1,23 +1,23 @@ ---- lib/Makefile.am.orig 2015-10-12 04:12:33 UTC +--- lib/Makefile.am.orig 2019-06-10 02:04:34 UTC +++ lib/Makefile.am -@@ -53,6 +53,7 @@ libseafile_common_la_SOURCES = ${seafile +@@ -51,6 +51,7 @@ libseafile_common_la_SOURCES = ${seafile_object_gen} $ libseafile_common_la_LDFLAGS = -no-undefined - libseafile_common_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ -lcrypto @LIB_GDI32@ \ + libseafile_common_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @LIB_GDI32@ \ @LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \ + @LIB_KVM@ \ @LIBEVENT_LIBS@ @SEARPC_LIBS@ @LIB_SHELL32@ \ @ZLIB_LIBS@ -@@ -74,7 +75,7 @@ vala.stamp: ${seafile_object_define} +@@ -72,7 +73,7 @@ vala.stamp: ${seafile_object_define} rm -f ${seafile_object_gen} @rm -f vala.tmp @touch vala.tmp -- valac -C --pkg posix $^ -+ valac -C --pkg posix ${seafile_object_define} +- @VALAC@ -C --pkg posix $^ ++ @VALAC@ -C --pkg posix ${seafile_object_define} @mv -f vala.tmp $@ ${seafile_object_gen}: vala.stamp -@@ -90,5 +91,9 @@ install-data-local: +@@ -88,5 +89,9 @@ install-data-local: if MACOS sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) else @@ -25,5 +25,5 @@ + sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles) +else ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) - endif +endif + endif Modified: head/net-mgmt/seafile-client/files/patch-lib_utils.c ============================================================================== --- head/net-mgmt/seafile-client/files/patch-lib_utils.c Mon Jun 10 06:49:32 2019 (r503876) +++ head/net-mgmt/seafile-client/files/patch-lib_utils.c Mon Jun 10 07:51:26 2019 (r503877) @@ -1,6 +1,6 @@ ---- lib/utils.c.orig 2015-09-21 03:42:11 UTC +--- lib/utils.c.orig 2019-06-04 02:14:53 UTC +++ lib/utils.c -@@ -56,6 +56,16 @@ +@@ -50,6 +50,16 @@ #include <zlib.h> @@ -14,10 +14,10 @@ +#include <sys/user.h> +#endif + - extern int inet_pton(int af, const char *src, void *dst); + #include "log.h" -@@ -2112,14 +2122,19 @@ wchar_from_utf8 (const char *utf8) +@@ -2040,14 +2050,19 @@ wchar_from_utf8 (const char *utf8) #endif /* ifdef WIN32 */ @@ -38,7 +38,7 @@ return -1; } -@@ -2143,7 +2158,8 @@ find_process_in_dirent(struct dirent *di +@@ -2071,7 +2086,8 @@ find_process_in_dirent(struct dirent *dir, const char } /* read the /proc fs to determine whether some process is running */ @@ -48,7 +48,7 @@ { DIR *proc_dir = opendir("/proc"); if (!proc_dir) { -@@ -2168,7 +2184,8 @@ gboolean process_is_running (const char +@@ -2096,7 +2112,8 @@ gboolean process_is_running (const char *process_name) return FALSE; } @@ -58,7 +58,7 @@ { int count = 0; DIR *proc_dir = opendir("/proc"); -@@ -2192,6 +2209,14 @@ int count_process(const char *process_na +@@ -2120,6 +2137,14 @@ int count_process(const char *process_name) return count; } @@ -73,10 +73,13 @@ #endif #ifdef __APPLE__ -@@ -2202,6 +2227,119 @@ gboolean process_is_running (const char - } - #endif - +@@ -2127,6 +2152,119 @@ gboolean process_is_running (const char *process_name) + { + //TODO + return FALSE; ++} ++#endif ++ +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) +#define PSKIP(kp) ((kp)->ki_pid == mypid || \ @@ -187,9 +190,6 @@ + return count_process_procfs(process_name); + } + return count_running_process_kvm(process_name); -+} -+#endif -+ - char* - ccnet_object_type_from_id (const char *object_id) - { + } + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906100751.x5A7pQcE049246>