From 69c18b28cd377e804a2413273483f50e14e36689 Mon Sep 17 00:00:00 2001
From: Gergely Kiss <mail.gery@gmail.com>
Date: Sat, 2 May 2015 13:54:17 +0200
Subject: [PATCH 1/4] seafile: update to version 4.1.2

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
---
 net/seafile-ccnet/Makefile  | 4 ++--
 net/seafile-seahub/Makefile | 4 ++--
 net/seafile-server/Makefile | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile
index 898b939eb..6c7ae8d7b 100644
--- a/net/seafile-ccnet/Makefile
+++ b/net/seafile-ccnet/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-ccnet
-PKG_VERSION:=4.0.6
+PKG_VERSION:=4.1.2
 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:=1e1aeae83cc33356ebd5f064f4a4c148186b814d
+PKG_SOURCE_VERSION:=a73109f09af4ecc49cdc4c57cdde51b38e15c31a
 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 266e45c81..cbedc5c7f 100644
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-seahub
-PKG_VERSION:=4.0.6
+PKG_VERSION:=4.1.2
 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:=739b32b02c4803448d5cb75b3e22ec0073930aed
+PKG_SOURCE_VERSION:=3fb1288f920de03a4e2e6a06b60671ce98971742
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index a0931d1c0..a098f226c 100644
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-server
-PKG_VERSION:=4.0.6
+PKG_VERSION:=4.1.2
 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:=adf9a875a960c1471bf6c93fce397c576e985bb3
+PKG_SOURCE_VERSION:=c0166019c712e2e1d5e532fd5f7401b1b72db6d8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -33,7 +33,7 @@ define Package/seafile-server
 		+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)
+    EXTRA_DEPENDS:=seafile-ccnet (=4.1.2-a73109f09af4ecc49cdc4c57cdde51b38e15c31a), seafile-seahub (=4.1.2-3fb1288f920de03a4e2e6a06b60671ce98971742)
 endef
 
 define Package/seafile-server/description

From b7396c9334ae7cf0c783757196b64b0401251e9c Mon Sep 17 00:00:00 2001
From: Gergely Kiss <mail.gery@gmail.com>
Date: Sat, 2 May 2015 13:55:16 +0200
Subject: [PATCH 2/4] seafile: added configuration file to turn fastcgi mode
 on/off

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
---
 net/seafile-server/Makefile           |  7 +++++++
 net/seafile-server/files/seafile.init | 27 ++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index a098f226c..93ac450ff 100644
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -90,6 +90,13 @@ if ! id -u seafile >/dev/null 2>&1; then
 chown -R seafile:seafile /usr/share/seafile/
 chmod -R o-rwx /usr/share/seafile/
 
+if [ ! -f /etc/config/seafile ]; then
+cat <<EOF > /etc/config/seafile
+# Start Seahub in fastcgi mode - 1 = enable, 0 = disable
+SEAHUB_FASTCGI=0
+EOF
+fi
+
 if [ ! -d "/usr/share/seafile/seafile-data" ]
 then
    echo "*** Installation completed, running configuration script..."
diff --git a/net/seafile-server/files/seafile.init b/net/seafile-server/files/seafile.init
index e9d3b03dc..819807b16 100755
--- a/net/seafile-server/files/seafile.init
+++ b/net/seafile-server/files/seafile.init
@@ -6,9 +6,13 @@ EXTRA_HELP="	setup	Runs the setup script
 	create_admin	Creates the administrative login
 	reset_admin	Alias to create_admin"
 EXTRA_COMMANDS="setup create_admin reset_admin"
+SEAHUB_FASTCGI=0
 
-export PATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PATH"
-export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
+[ -f /etc/config/seafile ] && \
+    . /etc/config/seafile
+
+export PATH="/usr/share/seafile/seafile-server/seahub/thirdpart:${PATH}"
+export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:${PYTHONPATH}"
 
 start() {
 	if [ ! -d /var/run/seafile ]
@@ -18,27 +22,32 @@ 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
+	if [ ${SEAHUB_FASTCGI} -eq 1 ]; then
+	    cd "/usr/share/seafile" && \
+		sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \
+		"/usr/bin/seafile-admin" start --fastcgi
+	else
+	    cd "/usr/share/seafile" && \
+		sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \
+		"/usr/bin/seafile-admin" start
+	fi
 }
 
 stop() {
 	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
+	    sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \
 	    "/usr/bin/seafile-admin" stop
 }
 
 setup() {
 	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
+	    sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \
 	    "/usr/bin/seafile-admin" setup
 }
 
 create_admin() {
 	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
+	    sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \
 	    "/usr/bin/seafile-admin" create-admin
 }
 

From c5743c7b0be0a8349865f23b4e912c1a855df89b Mon Sep 17 00:00:00 2001
From: Gergely Kiss <mail.gery@gmail.com>
Date: Sun, 3 May 2015 21:01:21 +0200
Subject: [PATCH 3/4] seafile: create config file in a more elegant way

---
 net/seafile-server/Makefile           | 13 ++++++-------
 net/seafile-server/files/seafile.init |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index 93ac450ff..8e3541656 100644
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -40,6 +40,10 @@ define Package/seafile-server/description
    Open source cloud storage with advanced features on privacy protection and teamwork.
 endef
 
+define Package/seafile-server/conffiles
+/etc/config/seafile
+endef
+
 CONFIGURE_ARGS += --disable-riak \
 		    --disable-client \
 		    --disable-fuse \
@@ -60,6 +64,7 @@ define Package/seafile-server/install
 	$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
 	$(INSTALL_DIR) $(1)/usr/share/seafile/seafile-server/runtime
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seafile/ $(1)/usr/lib/python2.7/site-packages/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seaserv/ $(1)/usr/lib/python2.7/site-packages/
@@ -71,6 +76,7 @@ define Package/seafile-server/install
 	$(CP) $(PKG_BUILD_DIR)/scripts/sqlite2mysql.sh $(1)/usr/share/seafile/seafile-server/
 	$(CP) $(PKG_BUILD_DIR)/scripts/upgrade/ $(1)/usr/share/seafile/seafile-server/
 	$(INSTALL_BIN) ./files/seafile.init $(1)/etc/init.d/seafile
+	$(CP) ./files/seafile.conf $(1)/etc/config/seafile
 endef
 
 define Build/InstallDev
@@ -90,13 +96,6 @@ if ! id -u seafile >/dev/null 2>&1; then
 chown -R seafile:seafile /usr/share/seafile/
 chmod -R o-rwx /usr/share/seafile/
 
-if [ ! -f /etc/config/seafile ]; then
-cat <<EOF > /etc/config/seafile
-# Start Seahub in fastcgi mode - 1 = enable, 0 = disable
-SEAHUB_FASTCGI=0
-EOF
-fi
-
 if [ ! -d "/usr/share/seafile/seafile-data" ]
 then
    echo "*** Installation completed, running configuration script..."
diff --git a/net/seafile-server/files/seafile.init b/net/seafile-server/files/seafile.init
index 819807b16..42f98e2d9 100755
--- a/net/seafile-server/files/seafile.init
+++ b/net/seafile-server/files/seafile.init
@@ -6,6 +6,7 @@ EXTRA_HELP="	setup	Runs the setup script
 	create_admin	Creates the administrative login
 	reset_admin	Alias to create_admin"
 EXTRA_COMMANDS="setup create_admin reset_admin"
+
 SEAHUB_FASTCGI=0
 
 [ -f /etc/config/seafile ] && \

From d1270720dc3256886beffbad611507af9c9b2377 Mon Sep 17 00:00:00 2001
From: Gergely Kiss <mail.gery@gmail.com>
Date: Sun, 3 May 2015 21:05:35 +0200
Subject: [PATCH 4/4] seafile: missing config file added

---
 net/seafile-server/files/seafile.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 net/seafile-server/files/seafile.conf

diff --git a/net/seafile-server/files/seafile.conf b/net/seafile-server/files/seafile.conf
new file mode 100644
index 000000000..fa8240e94
--- /dev/null
+++ b/net/seafile-server/files/seafile.conf
@@ -0,0 +1,2 @@
+# Start Seahub in fastcgi mode - 1 = enable, 0 = disable
+SEAHUB_FASTCGI=0