seafile: update to version 4.0.6

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>

diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile
index 3fd7e1cd43f8dd55f29271faa2c7bf3d8cae6140..898b939eb8f3ff812b608d79367fc0f8583aa71b 100644 (file)
--- a/net/seafile-ccnet/Makefile
+++ b/net/seafile-ccnet/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2007-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-ccnet
-PKG_VERSION:=3.1.7
+PKG_VERSION:=4.0.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=GPL-3.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/haiwen/ccnet.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ddf42784fab3b5924f65e648facd21c3bffa2c72
+PKG_SOURCE_VERSION:=1e1aeae83cc33356ebd5f064f4a4c148186b814d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index be4aa5c7032a156023323f903c5738d0adffce0f..ef2d4907f14bee5b291c0ec317b5504920db14c9 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2007-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-seahub
-PKG_VERSION:=3.1.7
+PKG_VERSION:=4.0.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=Apache-2.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/haiwen/seahub.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a984c86442e7fc10c3bcf6d92b4843f7263547eb
+PKG_SOURCE_VERSION:=739b32b02c4803448d5cb75b3e22ec0073930aed
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
@@ -76,7 +76,7 @@ endef
 
 define Package/seafile-seahub/install
        $(INSTALL_DIR) $(1)/usr/share/seafile/seafile-server/seahub
-       $(CP) $(PKG_BUILD_DIR)/{locale,media,seahub,sql,subdomain,tests,thirdpart,tools} $(1)/usr/share/seafile/seafile-server/seahub/
+       $(CP) $(PKG_BUILD_DIR)/{locale,media,fabfile,seahub,sql,tests,thirdpart,tools} $(1)/usr/share/seafile/seafile-server/seahub/
        $(CP) $(PKG_BUILD_DIR)/*.{sh,template,py,txt} $(1)/usr/share/seafile/seafile-server/seahub/
        $(CP) $(PKG_BUILD_DIR)/{CONTRIBUTORS,HACKING,README.markdown} $(1)/usr/share/seafile/seafile-server/seahub/
        $(CP) $(PKG_BUILD_DIR)/pylintrc* $(1)/usr/share/seafile/seafile-server/seahub/

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index 3b977bdc25298869eeb01723f07615eaec977bee..a0931d1c01f3b60d3542da6a9b28d56609461ed8 100644 (file)
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2007-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-server
-PKG_VERSION:=3.1.7
+PKG_VERSION:=4.0.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=GPL-3.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/haiwen/seafile.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=69658fca88f258276be92447b1b4462b64a1c6b9
+PKG_SOURCE_VERSION:=adf9a875a960c1471bf6c93fce397c576e985bb3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -29,9 +29,11 @@ define Package/seafile-server
     TITLE:=Seafile server
     MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
     URL:=http://seafile.com/
-    DEPENDS:=+shadow-useradd +libarchive +libopenssl +glib2 +seafile-ccnet +libsearpc +sqlite3-cli +python-mysql \
-               +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 +libmysqlclient +libevhtp \
-               +libpthread +libuuid +seafile-seahub +bash +sudo +procps +procps-pkill $(ICONV_DEPENDS)
+    DEPENDS:=+shadow-useradd +libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub \
+               +sqlite3-cli +python-mysql +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 \
+               +libmysqlclient +libevhtp +libpthread +libuuid \
+               +bash +sudo +procps +procps-pkill $(ICONV_DEPENDS)
+    EXTRA_DEPENDS:=seafile-ccnet (=4.0.6-1e1aeae83cc33356ebd5f064f4a4c148186b814d), seafile-seahub (=4.0.6-739b32b02c4803448d5cb75b3e22ec0073930aed)
 endef
 
 define Package/seafile-server/description
@@ -99,9 +101,17 @@ then
       echo "*** ERROR: Configuration failed. Please fix the issues if any and re-run the script using the command below:"
       echo "*** \"/etc/init.d/seafile setup\""
    fi
-echo
-echo "*** NOTE: you need to create an admin account before using Seafile."
-echo "*** Please run \"/etc/init.d/seafile create_admin\" to do so."
+
+   echo
+   echo "*** NOTE: you need to create an admin account before using Seafile."
+   echo "*** Please run \"/etc/init.d/seafile create_admin\" to do so."
+else
+   echo "*** WARNING: it seems you are upgrading from an older version."
+   echo "*** If so, please run the appropriate upgrade script before using the new version of Seafile."
+   echo "*** Upgrade scripts are located at \"/usr/share/seafile/seafile-server/upgrade\""
+   echo
+   echo "*** For more information, please read http://manual.seafile.com/deploy/upgrade.html"
+   exit
 fi
 
 /etc/init.d/seafile enable

diff --git a/net/seafile-server/files/seafile.init b/net/seafile-server/files/seafile.init
index eed4f7942a19cea20ad94766c182e9667f74f613..e9d3b03dcca3962b4cf562cfe36500347d510b13 100755 (executable)
--- a/net/seafile-server/files/seafile.init
+++ b/net/seafile-server/files/seafile.init
@@ -18,6 +18,7 @@ start() {
            chmod o-rwx /var/run/seafile
        fi
 
+       # append parameter "--fastcgi" here to start seahub in fastcgi mode
        cd "/usr/share/seafile" && \
            sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
            "/usr/bin/seafile-admin" start