From owner-svn-ports-all@freebsd.org Mon Dec 26 12:55:11 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7921C64EBF; Mon, 26 Dec 2016 12:55:11 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A61A71EF8; Mon, 26 Dec 2016 12:55:11 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQCtAlT002868; Mon, 26 Dec 2016 12:55:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQCt9uC002851; Mon, 26 Dec 2016 12:55:09 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201612261255.uBQCt9uC002851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 26 Dec 2016 12:55:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429506 - in head/net-mgmt: . seafile-server seafile-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 12:55:11 -0000 Author: riggs Date: Mon Dec 26 12:55:09 2016 New Revision: 429506 URL: https://svnweb.freebsd.org/changeset/ports/429506 Log: Prepare split of net-mgmt/seafile in client / server ports; update to 6.0.6 PR: 215293 Submitted by: Ultima1252@gmail.com (maintainer) Added: head/net-mgmt/seafile-server/ - copied from r429314, head/net-mgmt/seafile/ Deleted: head/net-mgmt/seafile-server/files/patch-daemon_Makefile.am head/net-mgmt/seafile-server/files/patch-daemon_http-tx-mgr.c head/net-mgmt/seafile-server/files/patch-daemon_repo-mgr.c head/net-mgmt/seafile-server/files/patch-daemon_vc-utils.c Modified: head/net-mgmt/Makefile head/net-mgmt/seafile-server/Makefile head/net-mgmt/seafile-server/distinfo head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c head/net-mgmt/seafile-server/files/patch-configure.ac head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c head/net-mgmt/seafile-server/files/patch-lib_Makefile.am head/net-mgmt/seafile-server/files/patch-lib_net.c head/net-mgmt/seafile-server/files/patch-lib_utils.c head/net-mgmt/seafile-server/files/patch-lib_utils.h head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh head/net-mgmt/seafile-server/files/patch-scripts_upgrade_regenerate__secret__key.sh head/net-mgmt/seafile-server/files/patch-server_access-file.c head/net-mgmt/seafile-server/files/seafile.in head/net-mgmt/seafile-server/pkg-descr head/net-mgmt/seafile-server/pkg-plist Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Mon Dec 26 12:36:24 2016 (r429505) +++ head/net-mgmt/Makefile Mon Dec 26 12:55:09 2016 (r429506) @@ -306,6 +306,7 @@ SUBDIR += sdig SUBDIR += seafile SUBDIR += seafile-gui + SUBDIR += seafile-server SUBDIR += send SUBDIR += sendip SUBDIR += sipcalc Modified: head/net-mgmt/seafile-server/Makefile ============================================================================== --- head/net-mgmt/seafile/Makefile Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/Makefile Mon Dec 26 12:55:09 2016 (r429506) @@ -1,7 +1,7 @@ # $FreeBSD$ -PORTNAME= seafile -PORTVERSION= 6.0.0 +PORTNAME= seafile-server +PORTVERSION= 6.0.6 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -server CATEGORIES= net-mgmt @@ -18,7 +18,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearp libzdb.so:databases/libzdb \ libcurl.so:ftp/curl \ libinotify.so:devel/libinotify \ - libccnet.so:net-mgmt/ccnet \ + libccnet.so:net-mgmt/ccnet-server \ libevent.so:devel/libevent2 \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson @@ -26,21 +26,22 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \ bash:shells/bash +CONFLICTS= seafile-[0-9]* + USE_GITHUB= yes GH_ACCOUNT= haiwen USES= autoreconf gettext iconv libarchive libtool mysql pathfix \ - pkgconfig python:-2.7 shebangfix sqlite ssl + pgsql 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= scripts/*.sh scripts/upgrade/*.sh *.sh scripts/build/*.py \ + scripts/*.py scripts/upgrade/*.py tools/seafile-admin GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -CONFIGURE_ARGS= --enable-server +PATHFIX_MAKEFILEIN= Makefile.am + INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp LDFLAGS+= -L${LOCALBASE}/lib @@ -53,7 +54,7 @@ SEALIB= ${SEAFILE_SERVER}/seafile/lib USERS= seafile GROUPS= ${USERS} -USE_RC_SUBR= ${PORTNAME} +USE_RC_SUBR= seafile PLIST_SUB= USERS=${USERS} \ GROUPS=${GROUPS} \ SEAFILE_SERVER=${SEAFILE_SERVER} \ @@ -68,18 +69,14 @@ SUB_LIST+= USERS=${USERS} \ MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FUSE RIAK +OPTIONS_DEFINE= FUSE 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 @@ -111,12 +108,9 @@ post-install: ${LN} -s ${PREFIX}/${SEABIN}/${SERVPROG} ${STAGEDIR}${PREFIX}/bin/ .endfor - ${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/bin/seaf-cli ${STAGEDIR}${PREFIX}/${SEABIN}/seaf-cli.py - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli (cd ${STAGEDIR}${PREFIX}/lib && \ ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB}) - @${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \ - ${WRKSRC}/scripts/seaf-cli-wrapper.sh \ + @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \ ${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \ ${WRKSRC}/scripts/setup-seafile.sh \ ${STAGEDIR}${PREFIX}/bin/seafile-admin Modified: head/net-mgmt/seafile-server/distinfo ============================================================================== --- head/net-mgmt/seafile/distinfo Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/distinfo Mon Dec 26 12:55:09 2016 (r429506) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470238743 -SHA256 (haiwen-seafile-v6.0.0-server_GH0.tar.gz) = 778b4248c6596f25d337ea18b9422eeb6950c9b86456ac535c0f7c2fd5e8148f -SIZE (haiwen-seafile-v6.0.0-server_GH0.tar.gz) = 1149598 +TIMESTAMP = 1481476699 +SHA256 (haiwen-seafile-server-v6.0.6-server_GH0.tar.gz) = 3fa98cb16a7ada6468bffff87dba855501365d0be9c2c10201e8d31412538e3e +SIZE (haiwen-seafile-server-v6.0.6-server_GH0.tar.gz) = 695521 Modified: head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c ============================================================================== --- head/net-mgmt/seafile/files/patch-common_obj-backend-fs.c Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- common/obj-backend-fs.c.orig 2015-09-21 03:42:11 UTC +--- common/obj-backend-fs.c.orig 2016-10-09 09:30:49 UTC +++ common/obj-backend-fs.c @@ -101,7 +101,7 @@ obj_backend_fs_read (ObjBackend *bend, static int Modified: head/net-mgmt/seafile-server/files/patch-configure.ac ============================================================================== --- head/net-mgmt/seafile/files/patch-configure.ac Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-configure.ac Mon Dec 26 12:55:09 2016 (r429506) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2016-05-10 12:25:35 UTC +--- configure.ac.orig 2016-10-09 09:30:49 UTC +++ configure.ac -@@ -50,8 +50,16 @@ else +@@ -51,8 +51,16 @@ else AC_MSG_RESULT(no) fi @@ -18,7 +18,7 @@ blinux=true AC_MSG_RESULT(compile in linux) else -@@ -93,6 +101,11 @@ if test "$bwin32" != true; then +@@ -78,6 +86,11 @@ if test "$bwin32" != true; then [compile_fuse=$enableval],[compile_fuse="yes"]) fi @@ -27,10 +27,10 @@ + [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 "${ + AC_ARG_ENABLE(python, + AC_HELP_STRING([--enable-python],[build ccnet python binding]), + [compile_python=$enableval], +@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) @@ -38,7 +38,7 @@ AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) -@@ -193,6 +207,9 @@ if test "$bwin32" = true; then +@@ -134,6 +148,9 @@ if test "$bwin32" = true; then LIB_MAC= MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" LIB_CRYPT32=-lcrypt32 @@ -48,7 +48,7 @@ elif test "$bmac" = true ; then LIB_WS32= LIB_GDI32= -@@ -207,6 +224,26 @@ elif test "$bmac" = true ; then +@@ -148,6 +165,26 @@ elif test "$bmac" = true ; then LIB_MAC="-framework CoreServices" LIB_CRYPT32= LIB_ICONV=-liconv @@ -75,7 +75,7 @@ else LIB_WS32= LIB_GDI32= -@@ -220,6 +257,9 @@ else +@@ -161,6 +198,9 @@ else LIB_MAC= MSVC_CFLAGS= LIB_CRYPT32= @@ -85,7 +85,7 @@ fi AC_SUBST(LIB_WS32) -@@ -232,6 +272,9 @@ AC_SUBST(LIB_IPHLPAPI) +@@ -173,6 +213,9 @@ AC_SUBST(LIB_IPHLPAPI) AC_SUBST(LIB_SHELL32) AC_SUBST(LIB_PSAPI) AC_SUBST(LIB_MAC) @@ -95,7 +95,7 @@ AC_SUBST(MSVC_CFLAGS) AC_SUBST(LIB_CRYPT32) AC_SUBST(LIB_ICONV) -@@ -246,7 +289,9 @@ ZDB_REQUIRED=2.10 +@@ -187,7 +230,9 @@ ZDB_REQUIRED=2.10 #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 CURL_REQUIRED=7.17 FUSE_REQUIRED=2.7.3 @@ -105,7 +105,7 @@ PKG_CHECK_MODULES(SSL, [openssl]) AC_SUBST(SSL_CFLAGS) -@@ -276,9 +321,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= +@@ -217,9 +262,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= AC_SUBST(LIBEVENT_CFLAGS) AC_SUBST(LIBEVENT_LIBS) Modified: head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c ============================================================================== --- head/net-mgmt/seafile/files/patch-controller_seafile-controller.c Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- controller/seafile-controller.c.orig 2015-09-21 03:42:11 UTC +--- controller/seafile-controller.c.orig 2016-11-12 03:30:44 UTC +++ controller/seafile-controller.c @@ -17,6 +17,19 @@ #include "log.h" @@ -20,38 +20,38 @@ #define CHECK_PROCESS_INTERVAL 10 /* every 10 seconds */ SeafileController *ctl; -@@ -247,7 +260,20 @@ static void +@@ -244,7 +257,20 @@ static void init_seafile_path () { GError *error = NULL; +#if defined(__linux__) - char *executable = g_file_read_link ("/proc/self/exe", &error); + char *binary = g_file_read_link ("/proc/self/exe", &error); +#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + /* + * seafile.sh starts the process using abs path + */ -+ char executable[_POSIX_PATH_MAX]; -+ memset(executable, 0, _POSIX_PATH_MAX); -+ char * rc = realpath(command_name, executable); ++ char binary[_POSIX_PATH_MAX]; ++ memset(binary, 0, _POSIX_PATH_MAX); ++ char * rc = realpath(command_name, binary); + if (!rc) { -+ seaf_warning ("failed to readpath: %s\n", executable); ++ seaf_warning ("failed to readpath: %s\n", binary); + return; + } +#endif char *tmp = NULL; if (error != NULL) { seaf_warning ("failed to readlink: %s\n", error->message); -@@ -261,7 +287,9 @@ init_seafile_path () +@@ -258,7 +284,9 @@ init_seafile_path () topdir = g_path_get_dirname (installpath); +#if defined(__linux__) - g_free (executable); + g_free (binary); +#endif g_free (tmp); } -@@ -402,11 +430,40 @@ need_restart (int which) +@@ -400,11 +428,40 @@ need_restart (int which) return FALSE; } else { char buf[256]; @@ -92,7 +92,7 @@ } } } -@@ -877,6 +934,9 @@ int main (int argc, char **argv) +@@ -890,6 +947,9 @@ int main (int argc, char **argv) exit (1); } @@ -100,5 +100,14 @@ + command_name = argv[0]; +#endif char *config_dir = DEFAULT_CONFIG_DIR; + char *central_config_dir = NULL; char *seafile_dir = NULL; - char *logdir = NULL; +@@ -926,7 +986,7 @@ int main (int argc, char **argv) + case 'f': + daemon_mode = 0; + break; +- case 'L': ++ case 'l': + logdir = g_strdup(optarg); + break; + case 'g': Modified: head/net-mgmt/seafile-server/files/patch-lib_Makefile.am ============================================================================== --- head/net-mgmt/seafile/files/patch-lib_Makefile.am Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-lib_Makefile.am Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- lib/Makefile.am.orig 2015-10-12 04:12:33 UTC +--- lib/Makefile.am.orig 2016-10-21 22:12:15 UTC +++ lib/Makefile.am @@ -53,6 +53,7 @@ libseafile_common_la_SOURCES = ${seafile libseafile_common_la_LDFLAGS = -no-undefined Modified: head/net-mgmt/seafile-server/files/patch-lib_net.c ============================================================================== --- head/net-mgmt/seafile/files/patch-lib_net.c Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-lib_net.c Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- lib/net.c.orig 2015-09-21 03:42:11 UTC +--- lib/net.c.orig 2016-10-09 09:30:49 UTC +++ lib/net.c @@ -157,7 +157,11 @@ ccnet_net_bind_tcp (int port, int nonblo Modified: head/net-mgmt/seafile-server/files/patch-lib_utils.c ============================================================================== --- head/net-mgmt/seafile/files/patch-lib_utils.c Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-lib_utils.c Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- lib/utils.c.orig 2015-09-21 03:42:11 UTC +--- lib/utils.c.orig 2016-10-09 09:30:49 UTC +++ lib/utils.c @@ -56,6 +56,16 @@ @@ -17,7 +17,7 @@ extern int inet_pton(int af, const char *src, void *dst); -@@ -2112,14 +2122,19 @@ wchar_from_utf8 (const char *utf8) +@@ -2069,14 +2079,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 +@@ -2100,7 +2115,8 @@ find_process_in_dirent(struct dirent *di } /* 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 +@@ -2125,7 +2141,8 @@ gboolean process_is_running (const char 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 +@@ -2149,6 +2166,14 @@ int count_process(const char *process_na return count; } @@ -73,7 +73,7 @@ #endif #ifdef __APPLE__ -@@ -2202,6 +2227,119 @@ gboolean process_is_running (const char +@@ -2159,6 +2184,119 @@ gboolean process_is_running (const char } #endif Modified: head/net-mgmt/seafile-server/files/patch-lib_utils.h ============================================================================== --- head/net-mgmt/seafile/files/patch-lib_utils.h Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-lib_utils.h Mon Dec 26 12:55:09 2016 (r429506) @@ -1,8 +1,8 @@ ---- lib/utils.h.orig 2015-09-21 03:42:11 UTC +--- lib/utils.h.orig 2016-10-09 09:30:49 UTC +++ lib/utils.h -@@ -3,6 +3,9 @@ - #ifndef CCNET_UTILS_H - #define CCNET_UTILS_H +@@ -10,6 +10,9 @@ + #include + #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) +#include @@ -10,7 +10,7 @@ #include #include #include -@@ -13,7 +16,9 @@ +@@ -20,7 +23,9 @@ #include #include Modified: head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh ============================================================================== --- head/net-mgmt/seafile/files/patch-scripts_setup-seafile.sh Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh Mon Dec 26 12:55:09 2016 (r429506) @@ -1,6 +1,6 @@ ---- scripts/setup-seafile.sh.orig 2015-10-12 04:12:33 UTC +--- scripts/setup-seafile.sh.orig 2016-10-21 22:12:15 UTC +++ scripts/setup-seafile.sh -@@ -340,7 +340,11 @@ fi +@@ -318,7 +318,11 @@ fi } function copy_user_manuals() { Modified: head/net-mgmt/seafile-server/files/patch-scripts_upgrade_regenerate__secret__key.sh ============================================================================== --- head/net-mgmt/seafile/files/patch-scripts_upgrade_regenerate__secret__key.sh Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-scripts_upgrade_regenerate__secret__key.sh Mon Dec 26 12:55:09 2016 (r429506) @@ -1,4 +1,4 @@ ---- scripts/upgrade/regenerate_secret_key.sh.orig 2016-01-29 17:25:05 UTC +--- scripts/upgrade/regenerate_secret_key.sh.orig 2016-10-21 22:12:15 UTC +++ scripts/upgrade/regenerate_secret_key.sh @@ -10,4 +10,6 @@ seahub_settings_py=${TOPDIR}/seahub_sett Modified: head/net-mgmt/seafile-server/files/patch-server_access-file.c ============================================================================== --- head/net-mgmt/seafile/files/patch-server_access-file.c Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/patch-server_access-file.c Mon Dec 26 12:55:09 2016 (r429506) @@ -1,6 +1,6 @@ ---- server/access-file.c.orig 2015-11-12 02:40:40 UTC +--- server/access-file.c.orig 2016-10-09 09:30:49 UTC +++ server/access-file.c -@@ -221,10 +221,10 @@ write_block_data_cb (struct bufferevent +@@ -224,10 +224,10 @@ write_block_data_cb (struct bufferevent bev->cbarg = data->saved_cb_arg; /* Resume reading incomming requests. */ @@ -13,7 +13,7 @@ free_sendblock_data (data); return; } -@@ -306,10 +306,10 @@ next: +@@ -309,10 +309,10 @@ next: bev->cbarg = data->saved_cb_arg; /* Resume reading incomming requests. */ @@ -26,7 +26,7 @@ free_sendfile_data (data); return; } -@@ -403,10 +403,10 @@ write_dir_data_cb (struct bufferevent *b +@@ -406,10 +406,10 @@ write_dir_data_cb (struct bufferevent *b bev->cbarg = data->saved_cb_arg; /* Resume reading incomming requests. */ @@ -39,7 +39,7 @@ free_senddir_data (data); return; } -@@ -710,10 +710,10 @@ finish_file_range_request (struct buffer +@@ -697,10 +697,10 @@ finish_file_range_request (struct buffer bev->cbarg = data->saved_cb_arg; /* Resume reading incomming requests. */ Modified: head/net-mgmt/seafile-server/files/seafile.in ============================================================================== --- head/net-mgmt/seafile/files/seafile.in Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/files/seafile.in Mon Dec 26 12:55:09 2016 (r429506) @@ -57,7 +57,7 @@ stop_cmd="seafile_stop" : ${seafile_loglevel:="info"} command="%%PREFIX%%/%%SEAFILE_SERVER%%/seafile/bin/seafile-controller" -command_args="-c \"${seafile_ccnet}\" -d \"${seafile_datadir}\" -F \"${seafile_conf}\" -L \"${seafile_logdir}\" -g \"${seafile_loglevel}\" -G \"${seafile_loglevel}\"" +command_args="-c \"${seafile_ccnet}\" -d \"${seafile_datadir}\" -F \"${seafile_conf}\" -l \"${seafile_logdir}\" -g \"${seafile_loglevel}\" -G \"${seafile_loglevel}\"" required_dirs="${seafile_ccnet} ${seafile_conf} ${seafile_datadir}" required_files="${seafile_ccnet}/seafile.ini" @@ -75,10 +75,10 @@ check_component_running() { echo "{$name} is running, pid $pid. You can stop it by: " echo echo " kill $pid" - echo + echo echo "Stop it and try again." - echo - exit + echo + exit fi } @@ -103,6 +103,7 @@ export LD_LIBRARY_PATH=${seafile_path}/s seafile_start() { check_required_before; validate_already_running; + prepare_env; test_config; echo "Starting seafile server, please wait ..." @@ -121,13 +122,13 @@ seafile_start() { echo "Seafile server started" echo } - + seafile_stop() { if ! pgrep -f "seafile-controller -c ${seafile_ccnet}" 2>/dev/null 1>&2; then echo "Seafile is not running" return 1; fi - + echo "Stopping ${name}." pkill -SIGTERM -f "seafile-controller -c ${seafile_ccnet}" pkill -f "ccnet-server -c ${seafile_ccnet}" Modified: head/net-mgmt/seafile-server/pkg-descr ============================================================================== --- head/net-mgmt/seafile/pkg-descr Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/pkg-descr Mon Dec 26 12:55:09 2016 (r429506) @@ -1,11 +1,11 @@ -Seafile is a next-generation open source cloud storage system with -advanced support for file syncing, privacy protection and teamwork. -Collections of files are called libraries, and each library can be synced -separately. A library can be encrypted with a user chosen password. This -password is not stored on the server, so even the server admin cannot -view a file's contents. +Seafile is an open source cloud storage system with features on privacy +protection and teamwork. Collections of files are called libraries, and +each library can be synced separately. A library can also be encrypted +with a user chosen password. Seafile also allows users to create groups +and easily sharing files into groups. -Seafile allows users to create groups with file syncing, wiki, and -discussion to enable easy collaboration around documents within a team. +This is the core component of Seafile server. It provides RPC to the web +front-end (Seahub) to access files, and provides HTTP APIs to the desktop +clients for syncing files. -WWW: https://github.com/haiwen/seafile +WWW: https://github.com/haiwen/seafile-server Modified: head/net-mgmt/seafile-server/pkg-plist ============================================================================== --- head/net-mgmt/seafile/pkg-plist Sat Dec 24 08:40:18 2016 (r429314) +++ head/net-mgmt/seafile-server/pkg-plist Mon Dec 26 12:55:09 2016 (r429506) @@ -1,26 +1,22 @@ -bin/seaf-cli -bin/seaf-daemon bin/seafile-controller bin/seaf-server -include/seafile/monitor-rpc.h +include/seafile/seafile-error.h include/seafile/seafile-object.h include/seafile/seafile-rpc.h -include/seafile/seafile.h lib/libseafile.a lib/libseafile.so lib/libseafile.so.0 lib/libseafile.so.0.0.0 libdata/pkgconfig/libseafile.pc -man/man1/seaf-cli.1.gz -man/man1/seaf-daemon.1.gz +%%SEAFILE_SERVER%%/seaf-cli-wrapper.sh %%SEAFILE_SERVER%%/check_init_admin.py +%%SEAFILE_SERVER%%/migrate-to-ceph.sh %%SEAFILE_SERVER%%/reset-admin.sh %%SEAFILE_SERVER%%/seaf-fuse.sh %%SEAFILE_SERVER%%/seaf-gc.sh %%SEAFILE_SERVER%%/seafile.sh %%SEAFILE_SERVER%%/seafile/bin/seaf-fsck %%FUSE%%%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse -%%SEAFILE_SERVER%%/seafile/bin/seaf-cli.py %%SEAFILE_SERVER%%/seafile/bin/seaf-migrate %%SEAFILE_SERVER%%/seafile/bin/seaf-server %%SEAFILE_SERVER%%/seafile/bin/seaf-server-init @@ -41,8 +37,9 @@ man/man1/seaf-daemon.1.gz %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.py %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyc %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyo -%%PORTDOCS%%%%SEAFILE_SERVER%%/seafile/%%DOCSDIR%%/seafile-tutorial.doc +%%SEAFILE_SERVER%%/seafile/share/doc/seafile/seafile-tutorial.doc %%SEAFILE_SERVER%%/breakpad.py +%%SEAFILE_SERVER%%/seafobj_migrate.py %%SEAFILE_SERVER%%/seahub.sh %%SEAFILE_SERVER%%/setup-seafile-mysql.py %%SEAFILE_SERVER%%/setup-seafile-mysql.sh