Removed fastcgi, this is no longer supported in seafile 6.3+

and previous installs 6.3+ prior to this revision are broken
when using the seahub_fastcgi option.

3 files changed, 12 insertions, 13 deletions

diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 4d2795767903..d6c3bcd88a9e 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	seafile-server
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAFILE_VER}
 DISTVERSIONSUFFIX=	-server
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ultima@FreeBSD.org
diff --git a/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py b/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py
index 5ffbeda62589..10ebf9c54ec3 100644
--- a/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py
+++ b/net-mgmt/seafile-server/files/patch-scripts_setup-seafile-mysql.py
@@ -1,4 +1,4 @@
---- scripts/setup-seafile-mysql.py.orig	2017-03-18 16:19:38 UTC
+--- scripts/setup-seafile-mysql.py.orig	2018-08-19 23:40:51 UTC
 +++ scripts/setup-seafile-mysql.py
 @@ -19,6 +19,8 @@ from ConfigParser import ConfigParser
  
@@ -9,7 +9,7 @@
  
  try:
      import readline # pylint: disable=W0611
-@@ -422,8 +424,6 @@ Please choose a way to initialize seafile databases:
+@@ -424,8 +426,6 @@ Please choose a way to initialize seafil
          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):
-@@ -1167,17 +1167,23 @@ share_name = /
+@@ -1209,17 +1209,23 @@ limit_request_line = 8190
  
  class UserManualHandler(object):
      def __init__(self):
@@ -43,7 +43,7 @@
  
  def report_config():
      print
-@@ -1242,6 +1248,8 @@ def create_seafile_server_symlink():
+@@ -1284,6 +1290,8 @@ def create_seafile_server_symlink():
  def set_file_perm():
      filemode = 0600
      dirmode = 0700
@@ -52,7 +52,7 @@
      files = [
          seahub_config.seahub_settings_py,
      ]
-@@ -1253,8 +1261,10 @@ def set_file_perm():
+@@ -1295,8 +1303,10 @@ def set_file_perm():
      ]
      for fpath in files:
          os.chmod(fpath, filemode)
@@ -63,7 +63,7 @@
  
  env_mgr = EnvManager()
  ccnet_config = CcnetConfigurator()
-@@ -1445,8 +1455,12 @@ def report_success():
+@@ -1488,8 +1498,11 @@ def report_success():
  Your seafile server configuration has been finished successfully.
  -----------------------------------------------------------------
  
@@ -72,7 +72,6 @@
 +run seafile server:     sysrc seafile_enable=YES
 +                        service seafile { start | stop | restart }
 +run seahub  server:     sysrc seahub_enable=YES
-+fastcgi (optional):     sysrc seahub_fastcgi=1
 +                        service seahub { start | stop | restart }
 +run reset-admin:        ./reset-admin.sh
  
diff --git a/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh b/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh
index 87e1f8e5d7e3..fc08ed84ca11 100644
--- a/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh
+++ b/net-mgmt/seafile-server/files/patch-scripts_setup-seafile.sh
@@ -1,6 +1,6 @@
---- scripts/setup-seafile.sh.orig	2017-03-13 02:59:56 UTC
+--- scripts/setup-seafile.sh.orig	2018-08-19 23:40:51 UTC
 +++ scripts/setup-seafile.sh
-@@ -15,6 +15,8 @@ use_existing_seafile="false"
+@@ -17,6 +17,8 @@ use_existing_seafile="false"
  
  server_manual_http="https://github.com/haiwen/seafile/wiki"
  
@@ -9,7 +9,7 @@
  function welcome () {
      echo "-----------------------------------------------------------------"
      echo "This script will guide you to config and setup your seafile server."
-@@ -318,10 +320,17 @@ fi
+@@ -352,10 +354,17 @@ fi
  }
  
  function copy_user_manuals() {
@@ -28,7 +28,7 @@
  }
  
  function parse_params() {
-@@ -673,6 +682,13 @@ chmod 0600 "$dest_settings_py"
+@@ -713,6 +722,13 @@ chmod 0600 "$dest_settings_py"
  chmod 0700 "$default_ccnet_conf_dir"
  chmod 0700 "$seafile_data_dir"
  chmod 0700 "$default_conf_dir"
@@ -42,7 +42,7 @@
  
  # -------------------------------------------
  # copy user manuals to library template
-@@ -689,9 +705,18 @@ echo
+@@ -729,9 +745,17 @@ echo
  echo "-----------------------------------------------------------------"
  echo "Your seafile server configuration has been completed successfully." 
  echo "-----------------------------------------------------------------"
@@ -54,7 +54,6 @@
 +	echo "run seafile server:     sysrc seafile_enable=YES"
 +	echo "                        service seafile { start | stop | restart }"
 +	echo "run seahub  server:     sysrc seahub_enable=YES"
-+	echo "fastcgi (optional):     sysrc seahub_fastcgi=1"
 +	echo "                        service seahub { start | stop | restart }"
 +	echo "run reset-admin:        ./reset-admin.sh"
 +else