Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Apr 2020 00:28:25 +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: r531804 - in head: net-mgmt/ccnet-server net-mgmt/seafile-server net-mgmt/seafile-server/files www/py-seafdav www/py-seafobj www/seahub www/seahub/files
Message-ID:  <202004160028.03G0SP77047165@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ultima
Date: Thu Apr 16 00:28:24 2020
New Revision: 531804
URL: https://svnweb.freebsd.org/changeset/ports/531804

Log:
  * Updated to 7.1.3
  
  This minor version update no longer supports python 2.7.
  The way mysql support is detected upstream has changed. Instead of patching
  the configure.ac script, I used a couple hacks for this to be detected for
  custom configurations. Didn't detect any issues with this method but I'm
  open to change this in the future.
  
  Added a SeaHub upgrade message to smooth out upgrading. For upgrading from 7.0.x,
  if one does not clear the cache, http 500 will be returned.
  
  The seafile_datadir no longer points to the seahub.ini, this has been changed
  upstream and may cause upgrading issues if not using the default. This can
  easily be changed by setting it in rc.conf.
  
  Changes: https://download.seafile.com/published/seafile-manual/changelog/changelog-for-seafile-professional-server.md

Deleted:
  head/www/seahub/files/patch-seahub_api2_endpoints_search__user.py
Modified:
  head/net-mgmt/ccnet-server/Makefile
  head/net-mgmt/ccnet-server/distinfo
  head/net-mgmt/ccnet-server/pkg-plist
  head/net-mgmt/seafile-server/Makefile
  head/net-mgmt/seafile-server/Makefile.include
  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-mysql.py
  head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh
  head/net-mgmt/seafile-server/files/patch-server_Makefile.am
  head/net-mgmt/seafile-server/files/patch-server_upload-file.c
  head/net-mgmt/seafile-server/files/seafile.in
  head/net-mgmt/seafile-server/pkg-plist
  head/www/py-seafdav/Makefile
  head/www/py-seafdav/distinfo
  head/www/py-seafdav/pkg-plist
  head/www/py-seafobj/Makefile
  head/www/py-seafobj/distinfo
  head/www/py-seafobj/pkg-plist
  head/www/seahub/Makefile
  head/www/seahub/distinfo
  head/www/seahub/files/pkg-message.in
  head/www/seahub/files/seahub.in
  head/www/seahub/pkg-plist

Modified: head/net-mgmt/ccnet-server/Makefile
==============================================================================
--- head/net-mgmt/ccnet-server/Makefile	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/ccnet-server/Makefile	Thu Apr 16 00:28:24 2020	(r531804)
@@ -4,7 +4,6 @@ PORTNAME=	ccnet-server
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAFILE_VER}
 DISTVERSIONSUFFIX=	-server
-PORTREVISION=	1
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
 		libjansson.so:devel/jansson
 
 USES=		autoreconf compiler:c11 gnome libtool localbase mysql:client \
-		pathfix pgsql pkgconfig python:2.7 shebangfix ssl
+		pathfix pgsql pkgconfig python:3.6+ shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 USE_GNOME=	glib20
@@ -31,7 +30,9 @@ USE_OPENLDAP=	yes
 
 CONFLICTS=	ccnet-[0-9]*
 
-CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+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
@@ -40,6 +41,24 @@ 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}
@@ -53,4 +72,4 @@ post-install:
 
 .include "${.CURDIR}/../seafile-server/Makefile.include"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/net-mgmt/ccnet-server/distinfo
==============================================================================
--- head/net-mgmt/ccnet-server/distinfo	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/ccnet-server/distinfo	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564782008
-SHA256 (haiwen-ccnet-server-v7.0.4-server_GH0.tar.gz) = 86a419c34c2880ae6ba18a8db4cfde3cd1abaf4dc4671860c0a3609abc6ff2fd
-SIZE (haiwen-ccnet-server-v7.0.4-server_GH0.tar.gz) = 218022
+TIMESTAMP = 1585266436
+SHA256 (haiwen-ccnet-server-v7.1.3-server_GH0.tar.gz) = 148d9b1af9218943de310f3f2e29e542e7279dbfba307a1cdd894bf8b7faf2e8
+SIZE (haiwen-ccnet-server-v7.1.3-server_GH0.tar.gz) = 194097

Modified: head/net-mgmt/ccnet-server/pkg-plist
==============================================================================
--- head/net-mgmt/ccnet-server/pkg-plist	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/ccnet-server/pkg-plist	Thu Apr 16 00:28:24 2020	(r531804)
@@ -4,7 +4,6 @@ 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
@@ -29,54 +28,9 @@ 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/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/__init__.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/__init__.cpython-37.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/rpc.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__pycache__/rpc.cpython-37.pyc
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo
 @dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%

Modified: head/net-mgmt/seafile-server/Makefile
==============================================================================
--- head/net-mgmt/seafile-server/Makefile	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/Makefile	Thu Apr 16 00:28:24 2020	(r531804)
@@ -4,7 +4,6 @@ PORTNAME=	seafile-server
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAFILE_VER}
 DISTVERSIONSUFFIX=	-server
-PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -31,7 +30,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:database
 CONFLICTS=	seafile-[0-9]*
 
 USES=		autoreconf compiler:c11 gnome iconv libarchive libtool localbase mysql \
-		pathfix pgsql pkgconfig python:2.7 shebangfix sqlite ssl
+		pathfix pgsql pkgconfig python:3.6+ shebangfix sqlite ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 USE_GNOME=	glib20
@@ -40,7 +39,8 @@ USE_RC_SUBR=	seafile
 SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh *.sh scripts/build/*.py \
 		scripts/*.py scripts/upgrade/*.py tools/seafile-admin
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl \
+		-lcrypto" PKG_CONFIG_PATH="${WRKDIR}/pkgconfig"
 
 PATHFIX_MAKEFILEIN=	Makefile.am
 
@@ -63,16 +63,41 @@ FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
 
 NLS_USES=		gettext
 
+.include <bsd.port.pre.mk>
+
+_PKGCONFIGDIR=	${WRKDIR}/pkgconfig
+
 post-patch:
 # Fix P_KTHREAD r295435
 	${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c
-	${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} -E 's/stat.+\$$/stat -f %Su $$/' ${WRKSRC}/scripts/seafile.sh
 	${REINPLACE_CMD} 's/%%SEAFILE_USER%%/${USERS:[1]}/ ; s/%%SEAFILE_GROUP%%/${GROUPS:[1]}/' \
 			${WRKSRC}/scripts/setup-seafile.sh ${WRKSRC}/scripts/setup-seafile-mysql.py
+
+# Fix python hardcodings
+	${REINPLACE_CMD} 's/python3\.[0-9]/${PYTHON_VERSION}/g; s/python3 /${PYTHON_VERSION} / ; \
+			s/PYTHON=python3/PYTHON=${PYTHON_VERSION}/' \
+		${WRKSRC}/controller/seafile-controller.c ${WRKSRC}/scripts/reset-admin.sh \
+		${WRKSRC}/scripts/upgrade/upgrade_7.0_7.1.sh \
+		${WRKSRC}/scripts/seahub.sh ${WRKSRC}/scripts/setup-seafile.sh \
+		${WRKSRC}/scripts/setup-seafile-mysql.sh \
+		${WRKSRC}/scripts/setup-seafile-mysql.py
+	${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \
+		${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh
+
+	@${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} \
 		${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile \
@@ -107,4 +132,4 @@ makesum-all:
 
 .include "${.CURDIR}/Makefile.include"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/net-mgmt/seafile-server/Makefile.include
==============================================================================
--- head/net-mgmt/seafile-server/Makefile.include	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/Makefile.include	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-SEAFILE_VER=7.0.4
-SEAHUB_VER=7.0.11
+SEAFILE_VER=7.1.3
+SEAHUB_VER=7.1.3
 
 
 # Various vars used in most/all the Makefiles

Modified: head/net-mgmt/seafile-server/distinfo
==============================================================================
--- head/net-mgmt/seafile-server/distinfo	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/distinfo	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564782015
-SHA256 (haiwen-seafile-server-v7.0.4-server_GH0.tar.gz) = a17c8b5bdfc82ac893160ff6255b16882f748e3b3dbf6f72dee17d40b895f783
-SIZE (haiwen-seafile-server-v7.0.4-server_GH0.tar.gz) = 750836
+TIMESTAMP = 1585266438
+SHA256 (haiwen-seafile-server-v7.1.3-server_GH0.tar.gz) = 79f7722a34c304adb78462194e64d6a610bd5ee40def37f4e4cdf5befed44fcd
+SIZE (haiwen-seafile-server-v7.1.3-server_GH0.tar.gz) = 684351

Modified: head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-common_obj-backend-fs.c	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,6 +1,6 @@
---- common/obj-backend-fs.c.orig	2016-10-09 09:30:49 UTC
+--- common/obj-backend-fs.c.orig	2019-12-23 10:30:49 UTC
 +++ common/obj-backend-fs.c
-@@ -101,7 +101,7 @@ obj_backend_fs_read (ObjBackend *bend,
+@@ -95,7 +95,7 @@ obj_backend_fs_read (ObjBackend *bend,
  static int
  fsync_obj_contents (int fd)
  {
@@ -9,7 +9,7 @@
      /* Some file systems may not support fsync().
       * In this case, just skip the error.
       */
-@@ -153,7 +153,7 @@ fsync_obj_contents (int fd)
+@@ -147,7 +147,7 @@ fsync_obj_contents (int fd)
  static int
  rename_and_sync (const char *tmp_path, const char *obj_path)
  {

Modified: head/net-mgmt/seafile-server/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-configure.ac	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-configure.ac	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,4 +1,4 @@
---- configure.ac.orig	2017-11-03 09:11:19 UTC
+--- configure.ac.orig	2019-12-23 10:30:49 UTC
 +++ configure.ac
 @@ -51,8 +51,16 @@ else
    AC_MSG_RESULT(no)
@@ -30,7 +30,7 @@
  AC_ARG_ENABLE(python,
                AC_HELP_STRING([--enable-python],[build seafile python binding]),
                [compile_python=$enableval],
-@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}"
+@@ -94,6 +107,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}"
  
  AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
  AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
@@ -38,7 +38,7 @@
  AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
  
  
-@@ -134,6 +148,8 @@ if test "$bwin32" = true; then
+@@ -139,6 +153,8 @@ if test "$bwin32" = true; then
    LIB_MAC=
    MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
    LIB_CRYPT32=-lcrypt32
@@ -47,7 +47,7 @@
    LIB_ICONV=-liconv
  elif test "$bmac" = true ; then
    LIB_WS32=
-@@ -149,6 +165,24 @@ elif test "$bmac" = true ; then
+@@ -154,6 +170,24 @@ elif test "$bmac" = true ; then
    LIB_MAC="-framework CoreServices"
    LIB_CRYPT32=
    LIB_ICONV=-liconv
@@ -72,7 +72,7 @@
  else
    LIB_WS32=
    LIB_GDI32=
-@@ -162,6 +196,8 @@ else
+@@ -167,6 +201,8 @@ else
    LIB_MAC=
    MSVC_CFLAGS=
    LIB_CRYPT32=
@@ -81,7 +81,7 @@
  fi
  
  AC_SUBST(LIB_WS32)
-@@ -174,6 +210,8 @@ AC_SUBST(LIB_IPHLPAPI)
+@@ -179,6 +215,8 @@ AC_SUBST(LIB_IPHLPAPI)
  AC_SUBST(LIB_SHELL32)
  AC_SUBST(LIB_PSAPI)
  AC_SUBST(LIB_MAC)
@@ -90,7 +90,7 @@
  AC_SUBST(MSVC_CFLAGS)
  AC_SUBST(LIB_CRYPT32)
  AC_SUBST(LIB_ICONV)
-@@ -189,6 +227,8 @@ ZDB_REQUIRED=2.10
+@@ -194,6 +232,8 @@ ZDB_REQUIRED=2.10
  CURL_REQUIRED=7.17
  FUSE_REQUIRED=2.7.3
  ZLIB_REQUIRED=1.2.0
@@ -99,7 +99,7 @@
  
  PKG_CHECK_MODULES(SSL, [openssl])
  AC_SUBST(SSL_CFLAGS)
-@@ -221,6 +261,14 @@ AC_SUBST(LIBEVENT_LIBS)
+@@ -226,6 +266,14 @@ AC_SUBST(LIBEVENT_LIBS)
  PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
  AC_SUBST(ZLIB_CFLAGS)
  AC_SUBST(ZLIB_LIBS)
@@ -112,5 +112,5 @@
 +AC_SUBST(ONIGURUMA_CFLAGS)
 +AC_SUBST(ONIGURUMA_LIBS)
  
- if test x${compile_python} = xyes; then
-     AM_PATH_PYTHON([2.6])
+ if test "x${MYSQL_CONFIG}" = "xdefault_mysql_config"; then
+     PKG_CHECK_MODULES(MYSQL, [mysqlclient], [have_mysql="yes"], [have_mysql="no"])

Modified: head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,4 +1,4 @@
---- controller/seafile-controller.c.orig	2019-03-28 10:14:20 UTC
+--- controller/seafile-controller.c.orig	2019-12-23 10:30:49 UTC
 +++ controller/seafile-controller.c
 @@ -17,6 +17,19 @@
  #include "log.h"
@@ -20,7 +20,7 @@
  #define CHECK_PROCESS_INTERVAL 10        /* every 10 seconds */
  
  #if defined(__sun)
-@@ -265,7 +278,20 @@ static void
+@@ -246,7 +259,20 @@ static void
  init_seafile_path ()
  {
      GError *error = NULL;
@@ -41,7 +41,7 @@
      char *tmp = NULL;
      if (error != NULL) {
          seaf_warning ("failed to readlink: %s\n", error->message);
-@@ -279,7 +305,9 @@ init_seafile_path ()
+@@ -260,7 +286,9 @@ init_seafile_path ()
  
      topdir = g_path_get_dirname (installpath);
  
@@ -51,7 +51,7 @@
      g_free (tmp);
  }
  
-@@ -457,12 +485,41 @@ need_restart (int which)
+@@ -416,12 +444,41 @@ need_restart (int which)
          return FALSE;
      } else {
          char buf[256];
@@ -93,7 +93,7 @@
          }
      }
  }
-@@ -980,6 +1037,9 @@ int main (int argc, char **argv)
+@@ -794,6 +851,9 @@ int main (int argc, char **argv)
          exit (1);
      }
  
@@ -103,7 +103,7 @@
      char *config_dir = DEFAULT_CONFIG_DIR;
      char *central_config_dir = NULL;
      char *seafile_dir = NULL;
-@@ -1016,7 +1076,7 @@ int main (int argc, char **argv)
+@@ -830,7 +890,7 @@ int main (int argc, char **argv)
          case 'f':
              daemon_mode = 0;
              break;

Modified: head/net-mgmt/seafile-server/files/patch-lib_Makefile.am
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-lib_Makefile.am	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-lib_Makefile.am	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,6 +1,6 @@
---- lib/Makefile.am.orig	2016-10-21 22:12:15 UTC
+--- lib/Makefile.am.orig	2020-01-19 18:47:28 UTC
 +++ lib/Makefile.am
-@@ -53,6 +53,7 @@ libseafile_common_la_SOURCES = ${seafile
+@@ -45,6 +45,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@ \
  				     @LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \
@@ -8,7 +8,7 @@
  					 @LIBEVENT_LIBS@ @SEARPC_LIBS@ @LIB_SHELL32@ \
  	@ZLIB_LIBS@
  
-@@ -74,7 +75,7 @@ vala.stamp: ${seafile_object_define}
+@@ -66,7 +67,7 @@ vala.stamp: ${seafile_object_define}
  	rm -f ${seafile_object_gen}
  	@rm -f vala.tmp
  	@touch vala.tmp
@@ -17,7 +17,7 @@
  	@mv -f vala.tmp $@
  
  ${seafile_object_gen}: vala.stamp
-@@ -90,5 +91,9 @@ install-data-local:
+@@ -82,5 +83,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-server/files/patch-lib_net.c
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-lib_net.c	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-lib_net.c	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,6 +1,6 @@
---- lib/net.c.orig	2016-10-09 09:30:49 UTC
+--- lib/net.c.orig	2019-12-23 10:30:49 UTC
 +++ lib/net.c
-@@ -157,7 +157,11 @@ ccnet_net_bind_tcp (int port, int nonblo
+@@ -157,7 +157,11 @@ ccnet_net_bind_tcp (int port, int nonblock)
  
      snprintf (buf, sizeof(buf), "%d", port);
  

Modified: head/net-mgmt/seafile-server/files/patch-lib_utils.c
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-lib_utils.c	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-lib_utils.c	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,4 +1,4 @@
---- lib/utils.c.orig	2016-10-09 09:30:49 UTC
+--- lib/utils.c.orig	2019-12-23 10: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);
  
  
-@@ -2069,14 +2079,19 @@ wchar_from_utf8 (const char *utf8)
+@@ -2047,14 +2057,19 @@ wchar_from_utf8 (const char *utf8)
  
  #endif  /* ifdef WIN32 */
  
@@ -38,7 +38,7 @@
          return -1;
      }
  
-@@ -2100,7 +2115,8 @@ find_process_in_dirent(struct dirent *di
+@@ -2078,7 +2093,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) {
-@@ -2125,7 +2141,8 @@ gboolean process_is_running (const char 
+@@ -2103,7 +2119,8 @@ gboolean process_is_running (const char *process_name)
      return FALSE;
  }
  
@@ -58,7 +58,7 @@
  {
      int count = 0;
      DIR *proc_dir = opendir("/proc");
-@@ -2149,6 +2166,14 @@ int count_process(const char *process_na
+@@ -2127,6 +2144,14 @@ int count_process(const char *process_name)
      return count;
  }
  
@@ -73,10 +73,13 @@
  #endif
  
  #ifdef __APPLE__
-@@ -2159,6 +2184,119 @@ gboolean process_is_running (const char 
- }
- #endif
- 
+@@ -2134,6 +2159,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
+ 

Modified: head/net-mgmt/seafile-server/files/patch-lib_utils.h
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-lib_utils.h	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-lib_utils.h	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,4 +1,4 @@
---- lib/utils.h.orig	2016-10-09 09:30:49 UTC
+--- lib/utils.h.orig	2019-12-23 10:30:49 UTC
 +++ lib/utils.h
 @@ -10,6 +10,9 @@
  #include <windows.h>

Modified: head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,15 +1,15 @@
---- scripts/setup-seafile-mysql.py.orig	2018-08-19 23:40:51 UTC
+--- scripts/setup-seafile-mysql.py.orig	2020-01-19 18:47:28 UTC
 +++ scripts/setup-seafile-mysql.py
-@@ -19,6 +19,8 @@ from ConfigParser import ConfigParser
+@@ -23,6 +23,8 @@ try:
+ except ImportError:
+     pass
  
- import MySQLdb
- 
 +import pwd
 +import grp
  
- try:
-     import readline # pylint: disable=W0611
-@@ -424,8 +426,6 @@ Please choose a way to initialize seafil
+ SERVER_MANUAL_HTTP = 'https://download.seafile.com/published/seafile-manual/home.md'
+ 
+@@ -421,8 +423,6 @@ Please choose a way to initialize seafile databases:
          if not re.match(r'^[a-zA-Z0-9_\-\.]+$', host):
              raise InvalidAnswer('%s is not a valid host' % Utils.highlight(host))
  
@@ -18,7 +18,7 @@
          return host
  
      def ask_mysql_host(self):
-@@ -1209,17 +1209,23 @@ limit_request_line = 8190
+@@ -1276,17 +1276,23 @@ limit_request_line = 8190
  
  class UserManualHandler(object):
      def __init__(self):
@@ -42,17 +42,17 @@
 +            os.chown(doc_full, uid, gid)
  
  def report_config():
-     print
-@@ -1284,6 +1290,8 @@ def create_seafile_server_symlink():
+     print()
+@@ -1351,6 +1357,8 @@ def create_seafile_server_symlink():
  def set_file_perm():
-     filemode = 0600
-     dirmode = 0700
+     filemode = 0o600
+     dirmode = 0o700
 +    uid = pwd.getpwnam("%%SEAFILE_USER%%").pw_uid
 +    gid = grp.getgrnam("%%SEAFILE_GROUP%%").gr_gid
      files = [
          seahub_config.seahub_settings_py,
      ]
-@@ -1295,8 +1303,10 @@ def set_file_perm():
+@@ -1362,8 +1370,10 @@ def set_file_perm():
      ]
      for fpath in files:
          os.chmod(fpath, filemode)
@@ -63,7 +63,7 @@
  
  env_mgr = EnvManager()
  ccnet_config = CcnetConfigurator()
-@@ -1488,8 +1498,11 @@ def report_success():
+@@ -1557,8 +1567,11 @@ def report_success():
  Your seafile server configuration has been finished successfully.
  -----------------------------------------------------------------
  

Modified: head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,15 +1,15 @@
---- scripts/setup-seafile.sh.orig	2019-08-20 19:25:53 UTC
+--- scripts/setup-seafile.sh.orig	2020-02-09 03:22:51 UTC
 +++ scripts/setup-seafile.sh
-@@ -17,6 +17,8 @@ use_existing_seafile="false"
+@@ -14,6 +14,8 @@ export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/
  
- server_manual_http="https://github.com/haiwen/seafile/wiki"
+ server_manual_http='https://download.seafile.com/published/seafile-manual/home.md'
  
 +os_bsd=$(uname | grep -cm1 -e BSD -e DragonFly)
 +
  function welcome () {
      echo "-----------------------------------------------------------------"
      echo "This script will guide you to config and setup your seafile server."
-@@ -343,10 +345,17 @@ fi
+@@ -330,10 +332,17 @@ fi
  }
  
  function copy_user_manuals() {
@@ -17,18 +17,18 @@
 +    if [ $os_bsd == "1" ]; then
 +        src_docs_dir=${INSTALLPATH}/seafile/share/doc/seafile/
 +    else
-+    	src_docs_dir=${INSTALLPATH}/seafile/docs/
++        src_docs_dir=${INSTALLPATH}/seafile/docs/
 +    fi
-     library_template_dir=${seafile_data_dir}/library-template
+     library_template_dir=${default_seafile_data_dir}/library-template
      mkdir -p ${library_template_dir}
      cp -f ${src_docs_dir}/*.doc ${library_template_dir}
 +    if [ $os_bsd == "1" ]; then
-+    	chown -R %%SEAFILE_USER%%:%%SEAFILE_GROUP%% "${library_template_dir}"
++        chown -R %%SEAFILE_USER%%:%%SEAFILE_GROUP%% "${library_template_dir}"
 +    fi
  }
  
  function parse_params() {
-@@ -662,7 +671,12 @@ function get_seahub_admin_passwd () {
+@@ -621,7 +630,12 @@ function get_seahub_admin_passwd () {
  echo "Creating database now, it may take one minute, please wait... "
  echo
  
@@ -42,9 +42,9 @@
  
  ccnet_group_db=${TOPDIR}/ccnet/GroupMgr/groupmgr.db
  ccnet_group_sql=${INSTALLPATH}/sql/sqlite/groupmgr.sql
-@@ -740,6 +754,14 @@ chmod 0600 "$dest_settings_py"
+@@ -699,6 +713,14 @@ chmod 0600 "$dest_settings_py"
  chmod 0700 "$default_ccnet_conf_dir"
- chmod 0700 "$seafile_data_dir"
+ chmod 0700 "$default_seafile_data_dir"
  chmod 0700 "$default_conf_dir"
 +if [ $os_bsd == "1" ]; then
 +	for file in "$dest_settings_py" "$default_ccnet_conf_dir" \
@@ -52,12 +52,12 @@
 +	"$ccnet_org_db" "$ccnet_user_db"; do
 +		chown %%SEAFILE_USER%%:%%SEAFILE_GROUP%% "$file"
 +	done
-+	chown -R %%SEAFILE_USER%%:%%SEAFILE_GROUP%% "$seafile_data_dir"
++	chown -R %%SEAFILE_USER%%:%%SEAFILE_GROUP%% "$default_seafile_data_dir"
 +fi
  
  # -------------------------------------------
  # copy user manuals to library template
-@@ -756,9 +778,17 @@ echo
+@@ -715,9 +737,17 @@ echo
  echo "-----------------------------------------------------------------"
  echo "Your seafile server configuration has been completed successfully." 
  echo "-----------------------------------------------------------------"

Modified: head/net-mgmt/seafile-server/files/patch-server_Makefile.am
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-server_Makefile.am	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-server_Makefile.am	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,11 +1,11 @@
---- server/Makefile.am.orig	2018-01-04 05:04:59 UTC
+--- server/Makefile.am.orig	2020-02-09 00:56:37 UTC
 +++ server/Makefile.am
-@@ -114,7 +114,7 @@ seaf_server_SOURCES = \
+@@ -73,7 +73,7 @@ seaf_server_SOURCES = \
  
  seaf_server_LDADD = @CCNET_LIBS@ \
  	$(top_builddir)/lib/libseafile_common.la \
 -	@GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \
 +	@ONIGURUMA_LIBS@ @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \
  	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/common/db-wrapper/libdbwrapper.la \
  	@SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \
+ 	@LIBARCHIVE_LIBS@ @LIB_ICONV@ \

Modified: head/net-mgmt/seafile-server/files/patch-server_upload-file.c
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-server_upload-file.c	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/patch-server_upload-file.c	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,6 +1,6 @@
---- server/upload-file.c.orig	2018-01-06 08:00:46 UTC
+--- server/upload-file.c.orig	2019-12-23 10:30:49 UTC
 +++ server/upload-file.c
-@@ -2058,7 +2058,7 @@ out:
+@@ -2306,7 +2306,7 @@ out:
          /* Set keepalive to 0. This will cause evhtp to close the
           * connection after sending the reply.
           */
@@ -9,7 +9,7 @@
  
          fsm->state = RECV_ERROR;
      }
-@@ -2259,8 +2259,8 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers
+@@ -2607,8 +2607,8 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers
      }
  
      /* Set up per-request hooks, so that we can read file data piece by piece. */
@@ -20,7 +20,7 @@
      /* Set arg for upload_cb or update_cb. */
      req->cbarg = fsm;
  
-@@ -2275,7 +2275,7 @@ err:
+@@ -2623,7 +2623,7 @@ err:
      /* Set keepalive to 0. This will cause evhtp to close the
       * connection after sending the reply.
       */
@@ -29,13 +29,9 @@
      send_error_reply (req, EVHTP_RES_BADREQ, err_msg);
  
      g_free (repo_id);
-@@ -2344,38 +2344,38 @@ upload_file_init (evhtp_t *htp, const char *http_temp_
+@@ -2724,32 +2724,32 @@ upload_file_init (evhtp_t *htp, const char *http_temp_
+     g_free (cluster_shared_dir);
  
-     cb = evhtp_set_regex_cb (htp, "^/upload/.*", upload_cb, NULL);
-     /* upload_headers_cb() will be called after evhtp parsed all http headers. */
--    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
-+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
- 
      cb = evhtp_set_regex_cb (htp, "^/upload-api/.*", upload_api_cb, NULL);
 -    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 +    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
@@ -50,17 +46,12 @@
 +    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
  
      /* cb = evhtp_set_regex_cb (htp, "^/upload-blks-aj/.*", upload_blks_ajax_cb, NULL); */
--    /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
-+    /* evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); */
+     /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
  
      cb = evhtp_set_regex_cb (htp, "^/upload-aj/.*", upload_ajax_cb, NULL);
 -    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 +    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
  
-     cb = evhtp_set_regex_cb (htp, "^/update/.*", update_cb, NULL);
--    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
-+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
- 
      cb = evhtp_set_regex_cb (htp, "^/update-api/.*", update_api_cb, NULL);
 -    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 +    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
@@ -70,8 +61,7 @@
 +    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
  
      /* cb = evhtp_set_regex_cb (htp, "^/update-blks-aj/.*", update_blks_ajax_cb, NULL); */
--    /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
-+    /* evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);  */
+     /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
  
      cb = evhtp_set_regex_cb (htp, "^/update-aj/.*", update_ajax_cb, NULL);
 -    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);

Modified: head/net-mgmt/seafile-server/files/seafile.in
==============================================================================
--- head/net-mgmt/seafile-server/files/seafile.in	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/files/seafile.in	Thu Apr 16 00:28:24 2020	(r531804)
@@ -52,7 +52,7 @@ stop_cmd="seafile_stop"
 : ${seafile_path:="%%PREFIX%%/%%SEAFILE_SERVER%%"}
 : ${seafile_ccnet:="%%PREFIX%%/%%HAIWENDIR%%/ccnet"}
 : ${seafile_conf:="%%PREFIX%%/%%HAIWENDIR%%/conf"}
-: ${seafile_datadir:="`cat ${seafile_ccnet}/seafile.ini 2>/dev/null`"}
+: ${seafile_datadir:="%%PREFIX%%/%%HAIWENDIR%%/seafile-data"}
 : ${seafile_logdir:="%%PREFIX%%/%%HAIWENDIR%%/logs"}
 : ${seafile_loglevel:="info"}
 
@@ -60,7 +60,6 @@ command="%%PREFIX%%/%%SEAFILE_SERVER%%/seafile/bin/sea
 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"
 
 test_config() {
 	if ! su -m ${seafile_user} -c "${command} -t ${command_args}" ; then

Modified: head/net-mgmt/seafile-server/pkg-plist
==============================================================================
--- head/net-mgmt/seafile-server/pkg-plist	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/net-mgmt/seafile-server/pkg-plist	Thu Apr 16 00:28:24 2020	(r531804)
@@ -2,53 +2,48 @@ bin/seaf-server
 bin/seafile-controller
 include/seafile/seafile-object.h
 libdata/pkgconfig/libseafile.pc
-%%SEAFILE_SERVER%%/breakpad.py
 %%SEAFILE_SERVER%%/check_init_admin.py
-%%SEAFILE_SERVER%%/export-users.sh
-%%SEAFILE_SERVER%%/migrate-to-ceph.sh
 %%SEAFILE_SERVER%%/reset-admin.sh
-%%SEAFILE_SERVER%%/seaf-cli-wrapper.sh
 %%SEAFILE_SERVER%%/seaf-fsck.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-migrate
 %%SEAFILE_SERVER%%/seafile/bin/seaf-server
 %%SEAFILE_SERVER%%/seafile/bin/seaf-server-init
 %%SEAFILE_SERVER%%/seafile/bin/seafile-controller
 %%SEAFILE_SERVER%%/seafile/bin/seafserv-gc
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__pycache__/__init__.cpython-37.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__pycache__/rpcclient.cpython-37.pyc
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/rpcclient.pyo
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__init__.pyo
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/__init__.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/__init__.cpython-37.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/api.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/api.cpython-37.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/service.cpython-37.opt-1.pyc
+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/__pycache__/service.cpython-37.pyc
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/api.pyo
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seaserv/service.pyo
 %%SEAFILE_SERVER%%/seafile/share/doc/seafile/seafile-tutorial.doc
 %%SEAFILE_SERVER%%/seafobj_migrate.py
 %%SEAHUBDIR%%.sh
 %%SEAFILE_SERVER%%/setup-seafile-mysql.py
 %%SEAFILE_SERVER%%/setup-seafile-mysql.sh
 %%SEAFILE_SERVER%%/setup-seafile.sh
-%%SEAFILE_SERVER%%/sqlite2mysql.py
-%%SEAFILE_SERVER%%/sqlite2mysql.sh
 %%SEAFILE_SERVER%%/sql/mysql/ccnet.sql
-%%SEAFILE_SERVER%%/sql/mysql/%%USERS%%.sql
+%%SEAFILE_SERVER%%/sql/mysql/seafile.sql
 %%SEAFILE_SERVER%%/sql/sqlite/config.sql
 %%SEAFILE_SERVER%%/sql/sqlite/groupmgr.sql
 %%SEAFILE_SERVER%%/sql/sqlite/org.sql
-%%SEAFILE_SERVER%%/sql/sqlite/%%USERS%%.sql
+%%SEAFILE_SERVER%%/sql/sqlite/seafile.sql
 %%SEAFILE_SERVER%%/sql/sqlite/user.sql
+%%SEAFILE_SERVER%%/sqlite2mysql.py
+%%SEAFILE_SERVER%%/sqlite2mysql.sh
 %%SEAFILE_SERVER%%/upgrade/add_collate.sh
 %%SEAFILE_SERVER%%/upgrade/db_update_1.3_1.4.py
 %%SEAFILE_SERVER%%/upgrade/db_update_helper.py
@@ -101,19 +96,21 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/sql/6.2.0/sqlite3/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/ccnet.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/seafevents.sql
-%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/%%USERS%%.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/seafile.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/ccnet/groupmgr.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/ccnet/usermgr.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seafevents.sql
-%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/%%USERS%%.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seafile.sql
 %%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/ccnet.sql
-%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/%%USERS%%.sql
+%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/seafile.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/ccnet/usermgr.sql
-%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/%%USERS%%.sql
+%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/seafile.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/7.1.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/7.1.0/sqlite3/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.2_1.3.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.3_1.4.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.4_1.5.sh
@@ -137,4 +134,4 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/upgrade_6.1_6.2.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_6.2_6.3.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_6.3_7.0.sh
-@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%
+%%SEAFILE_SERVER%%/upgrade/upgrade_7.0_7.1.sh

Modified: head/www/py-seafdav/Makefile
==============================================================================
--- head/www/py-seafdav/Makefile	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/www/py-seafdav/Makefile	Thu Apr 16 00:28:24 2020	(r531804)
@@ -17,16 +17,16 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5:de
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsmin>=2.2:devel/py-jsmin@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-pam>=1.8:security/py-python-pam@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=1.8:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=0:databases/py-sqlalchemy13@${PY_FLAVOR}
 
-USES=		python:2.7 shebangfix
+USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 USE_PYTHON=	flavors
-SHEBANG_FILES=	*.sh *.template wsgidav/addons/seafile/*.py
+SHEBANG_FILES=	*.py *.template wsgidav/dc/*.py
 
 NO_ARCH=	yes
 NO_BUILD=	yes

Modified: head/www/py-seafdav/distinfo
==============================================================================
--- head/www/py-seafdav/distinfo	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/www/py-seafdav/distinfo	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574229823
-SHA256 (haiwen-seafdav-v7.0.11-pro_GH0.tar.gz) = e6d39dd6b7adef0ca3f594aa37284a8330ce8d4261115ed24937d69133d3fac8
-SIZE (haiwen-seafdav-v7.0.11-pro_GH0.tar.gz) = 2556452
+TIMESTAMP = 1586378977
+SHA256 (haiwen-seafdav-v7.1.3-pro_GH0.tar.gz) = 1477a4267e46b5ca8e0ea0124e622186576a1e99980dc18095fec05fb67df2ce
+SIZE (haiwen-seafdav-v7.1.3-pro_GH0.tar.gz) = 2671479

Modified: head/www/py-seafdav/pkg-plist
==============================================================================
--- head/www/py-seafdav/pkg-plist	Thu Apr 16 00:28:06 2020	(r531803)
+++ head/www/py-seafdav/pkg-plist	Thu Apr 16 00:28:24 2020	(r531804)
@@ -1,159 +1,160 @@
 %%SITEPACKAGEDIR%%/wsgidav/__init__.py
-%%SITEPACKAGEDIR%%/wsgidav/__init__.pyc
-%%SITEPACKAGEDIR%%/wsgidav/__init__.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/__init__.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/__init__.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/__init__.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/couch_property_manager.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/couch_property_manager.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/couch_property_manager.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/hg_dav_provider.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/hg_dav_provider.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/hg_dav_provider.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/mongo_property_manager.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/mongo_property_manager.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/mongo_property_manager.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/mysql_dav_provider.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/mysql_dav_provider.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/mysql_dav_provider.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/nt_domain_controller.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/nt_domain_controller.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/nt_domain_controller.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/__init__.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/__init__.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/__init__.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/domain_controller.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/domain_controller.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/domain_controller.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seaf_utils.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seaf_utils.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seaf_utils.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seafile_dav_provider.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seafile_dav_provider.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seafile_dav_provider.pyo
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seahub_db.py
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seahub_db.pyc
-%%SITEPACKAGEDIR%%/wsgidav/addons/seafile/seahub_db.pyo
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/__init__.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/__init__.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/_version.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/_version.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/compat.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/compat.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/dav_error.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/dav_error.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/dav_provider.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/dav_provider.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/debug_filter.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/debug_filter.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/default_conf.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/default_conf.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/error_printer.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/error_printer.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/fs_dav_provider.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/fs_dav_provider.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/http_authenticator.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/http_authenticator.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/lock_manager.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/lock_manager.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/lock_storage.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/lock_storage.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/middleware.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/middleware.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/request_resolver.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/request_resolver.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/request_server.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/request_server.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/rw_lock.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/rw_lock.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/seafile_dav_provider.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/seafile_dav_provider.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/stream_tools.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/stream_tools.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/util.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/util.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/wsgidav_app.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/wsgidav_app.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/xml_tools.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/__pycache__/xml_tools.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/_version.py
+%%SITEPACKAGEDIR%%/wsgidav/compat.py
 %%SITEPACKAGEDIR%%/wsgidav/dav_error.py
-%%SITEPACKAGEDIR%%/wsgidav/dav_error.pyc
-%%SITEPACKAGEDIR%%/wsgidav/dav_error.pyo
 %%SITEPACKAGEDIR%%/wsgidav/dav_provider.py
-%%SITEPACKAGEDIR%%/wsgidav/dav_provider.pyc
-%%SITEPACKAGEDIR%%/wsgidav/dav_provider.pyo
+%%SITEPACKAGEDIR%%/wsgidav/dc/__init__.py
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/__init__.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/__init__.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/base_dc.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/base_dc.cpython-37.pyc
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/domain_controller.cpython-37.opt-1.pyc
+%%SITEPACKAGEDIR%%/wsgidav/dc/__pycache__/domain_controller.cpython-37.pyc

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004160028.03G0SP77047165>