Date: Tue, 24 Jan 2017 19:37:01 +0000 (UTC) From: Nikolai Lifanov <lifanov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432377 - in head/net-mgmt/seafile-client: . files Message-ID: <201701241937.v0OJb1l2081284@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lifanov Date: Tue Jan 24 19:37:01 2017 New Revision: 432377 URL: https://svnweb.freebsd.org/changeset/ports/432377 Log: update net-mgmt/seafile-client Changes: https://github.com/haiwen/seafile/commits/v6.0.2 * Removed -server options * Regenerated/removed patchfiles - Return error detail for clone and sync tasks. - Save file sync errors to database. - Use unified progress for multipart uploads. - Remove server code. - Use GLib to calculate SHA1. - Allow compiling with GPL-compatible crypto libraries. - Fix some bugs. - Add back seafile python library. PR: 216348 Submitted by: ultima1252@gmail.com (maintainer) Reviewed by: matthew Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D9292 Deleted: head/net-mgmt/seafile-client/files/patch-controller_seafile-controller.c head/net-mgmt/seafile-client/files/patch-daemon_vc-utils.c head/net-mgmt/seafile-client/files/patch-scripts_setup-seafile.sh head/net-mgmt/seafile-client/files/patch-scripts_upgrade_regenerate__secret__key.sh head/net-mgmt/seafile-client/files/patch-server_access-file.c Modified: head/net-mgmt/seafile-client/Makefile head/net-mgmt/seafile-client/distinfo head/net-mgmt/seafile-client/files/patch-configure.ac head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am head/net-mgmt/seafile-client/pkg-plist Modified: head/net-mgmt/seafile-client/Makefile ============================================================================== --- head/net-mgmt/seafile-client/Makefile Tue Jan 24 19:35:41 2017 (r432376) +++ head/net-mgmt/seafile-client/Makefile Tue Jan 24 19:37:01 2017 (r432377) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= seafile-client -PORTVERSION= 6.0.1 +PORTVERSION= 6.0.2 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt @@ -34,10 +34,7 @@ GH_PROJECT= seafile USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ pkgconfig python:-2.7 shebangfix sqlite ssl USE_GNOME= glib20 -SHEBANG_FILES= scripts/*.sh scripts/upgrade/*.sh tests/*.py tests/basic/*.sh \ - tests/sync-auto-test/*.template *.sh scripts/build/*.py \ - scripts/*.py *.py scripts/upgrade/*.py app/seaf-cli \ - tools/seafile-admin +SHEBANG_FILES= *.sh scripts/*.sh integration-tests/*.sh GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" @@ -46,21 +43,6 @@ INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= FUSE RIAK -OPTIONS_SUB= yes - -FUSE_DESC= Use file system in userspace -RIAK_DESC= Use distributed noSQL database - -FUSE_CONFIGURE_ENABLE= fuse -FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs - -RIAK_CONFIGURE_ENABLE= riak -RIAK_RUN_DEPENDS= riak:databases/riak - -OPTIONS_DEFAULT= FUSE -OPTIONS_EXCLUDE_DragonFly= FUSE - .include <bsd.port.options.mk> post-patch: @@ -68,11 +50,5 @@ post-patch: .if ${OSVERSION} >= 1100097 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c .endif - ${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \ - ${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh - ${REINPLACE_CMD} -e 's|^INSTALL.*|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"|' \ - ${WRKSRC}/scripts/seaf-cli-wrapper.sh - ${REINPLACE_CMD} 's/<evhtp.h>/<evhtp\/evhtp.h>/' ${WRKSRC}/server/upload-file.c \ - ${WRKSRC}/server/access-file.c ${WRKSRC}/server/http-server.c .include <bsd.port.mk> Modified: head/net-mgmt/seafile-client/distinfo ============================================================================== --- head/net-mgmt/seafile-client/distinfo Tue Jan 24 19:35:41 2017 (r432376) +++ head/net-mgmt/seafile-client/distinfo Tue Jan 24 19:37:01 2017 (r432377) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481772891 -SHA256 (haiwen-seafile-v6.0.1_GH0.tar.gz) = c212833ff21af19554d216ab3f5c01c3a5878d4bd30b4f71c67ec9b71416a095 -SIZE (haiwen-seafile-v6.0.1_GH0.tar.gz) = 1154256 +TIMESTAMP = 1485062937 +SHA256 (haiwen-seafile-v6.0.2_GH0.tar.gz) = 8ac2eb3611e69b4fd85a9572714153566705c73e443cf2ae24da556c7cf12078 +SIZE (haiwen-seafile-v6.0.2_GH0.tar.gz) = 454751 Modified: head/net-mgmt/seafile-client/files/patch-configure.ac ============================================================================== --- head/net-mgmt/seafile-client/files/patch-configure.ac Tue Jan 24 19:35:41 2017 (r432376) +++ head/net-mgmt/seafile-client/files/patch-configure.ac Tue Jan 24 19:37:01 2017 (r432377) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2016-05-10 12:25:35 UTC +--- configure.ac.orig 2017-01-05 08:05:21 UTC +++ configure.ac -@@ -50,8 +50,16 @@ else +@@ -51,8 +51,16 @@ else AC_MSG_RESULT(no) fi @@ -18,19 +18,7 @@ blinux=true AC_MSG_RESULT(compile in linux) else -@@ -93,6 +101,11 @@ if test "$bwin32" != true; then - [compile_fuse=$enableval],[compile_fuse="yes"]) - fi - -+if test "$bbsd" = true; then -+ AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]), -+ [compile_fuse=$enableval],[compile_fuse="no"]) -+fi -+ - AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable client]), - [compile_client=$enableval],[compile_client="yes"]) - -@@ -148,6 +161,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ +@@ -61,6 +69,7 @@ fi AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) @@ -38,7 +26,7 @@ AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) -@@ -193,6 +207,8 @@ if test "$bwin32" = true; then +@@ -105,6 +114,8 @@ if test "$bwin32" = true; then LIB_MAC= MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" LIB_CRYPT32=-lcrypt32 @@ -47,7 +35,7 @@ elif test "$bmac" = true ; then LIB_WS32= LIB_GDI32= -@@ -207,6 +224,24 @@ elif test "$bmac" = true ; then +@@ -119,6 +130,24 @@ elif test "$bmac" = true ; then LIB_MAC="-framework CoreServices" LIB_CRYPT32= LIB_ICONV=-liconv @@ -72,7 +60,7 @@ else LIB_WS32= LIB_GDI32= -@@ -220,6 +257,8 @@ else +@@ -132,6 +161,8 @@ else LIB_MAC= MSVC_CFLAGS= LIB_CRYPT32= @@ -81,7 +69,7 @@ fi AC_SUBST(LIB_WS32) -@@ -232,6 +272,8 @@ AC_SUBST(LIB_IPHLPAPI) +@@ -144,6 +175,8 @@ AC_SUBST(LIB_IPHLPAPI) AC_SUBST(LIB_SHELL32) AC_SUBST(LIB_PSAPI) AC_SUBST(LIB_MAC) Modified: head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am ============================================================================== --- head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am Tue Jan 24 19:35:41 2017 (r432376) +++ head/net-mgmt/seafile-client/files/patch-daemon_Makefile.am Tue Jan 24 19:37:01 2017 (r432377) @@ -1,6 +1,6 @@ ---- daemon/Makefile.am.orig 2016-04-15 23:08:45 UTC +--- daemon/Makefile.am.orig 2017-01-15 15:47:19 UTC +++ daemon/Makefile.am -@@ -63,6 +63,10 @@ if LINUX +@@ -61,6 +61,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 -@@ -126,6 +130,7 @@ seaf_daemon_LDADD = $(top_builddir)/lib/ - @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ \ +@@ -124,6 +128,7 @@ seaf_daemon_LDADD = $(top_builddir)/lib/ + @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@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @BPWRAPPER_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ \ -+ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @LIB_INOTIFY@ @BPWRAPPER_LIBS@ +- @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@ - seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ + seaf_daemon_LDFLAGS = @CONSOLE@ Modified: head/net-mgmt/seafile-client/pkg-plist ============================================================================== --- head/net-mgmt/seafile-client/pkg-plist Tue Jan 24 19:35:41 2017 (r432376) +++ head/net-mgmt/seafile-client/pkg-plist Tue Jan 24 19:37:01 2017 (r432377) @@ -1,6 +1,5 @@ bin/seaf-cli bin/seaf-daemon -include/seafile/monitor-rpc.h include/seafile/seafile-object.h include/seafile/seafile-rpc.h include/seafile/seafile.h @@ -14,15 +13,6 @@ lib/libseafile.so.0.0.0 %%PYTHON_SITELIBDIR%%/seafile/rpcclient.py %%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyc %%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyo -%%PYTHON_SITELIBDIR%%/seaserv/__init__.py -%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyc -%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyo -%%PYTHON_SITELIBDIR%%/seaserv/api.py -%%PYTHON_SITELIBDIR%%/seaserv/api.pyc -%%PYTHON_SITELIBDIR%%/seaserv/api.pyo -%%PYTHON_SITELIBDIR%%/seaserv/service.py -%%PYTHON_SITELIBDIR%%/seaserv/service.pyc -%%PYTHON_SITELIBDIR%%/seaserv/service.pyo libdata/pkgconfig/libseafile.pc man/man1/seaf-cli.1.gz man/man1/seaf-daemon.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701241937.v0OJb1l2081284>