seafile-seahub: bump to 6.3.0

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>

diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index 2cf27aef1f1cb2fbb724196c0263d9e1e08d8594..e2ae1a4c4b5c0c2317a11898ec609705d72a7215 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-seahub
-PKG_VERSION:=6.2.2
+PKG_VERSION:=6.3.0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
 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:=120e7a299e77968f1af48ea2dcf4bd9b909c426f
+PKG_SOURCE_VERSION:=d1ab146a936a6ea1e1581bf3f194e86742f0d3cd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=511500c40dd7b1009f77109c6df810df1cf2c17a84a8f6841d592a9e05d22064
+PKG_MIRROR_HASH:=21c2ed3886d0c87853f9720704b14c0a0dce8215e7346af775e306f80b29fa0d
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python-package.mk

diff --git a/net/seafile-seahub/patches/010-default-config.patch b/net/seafile-seahub/patches/010-default-config.patch
index 4168dc15f06c1e202a8e20fa06a16d0c69ae143a..b439495a45b0e86d6252e79607c64a31ac0f40b7 100644 (file)
--- a/net/seafile-seahub/patches/010-default-config.patch
+++ b/net/seafile-seahub/patches/010-default-config.patch
@@ -1,7 +1,6 @@
-diff -rupN seahub-3.1.7-server.orig/seahub/settings.py seahub-3.1.7-server/seahub/settings.py
---- seahub-3.1.7-server.orig/seahub/settings.py        2014-10-20 09:32:35.000000000 +0200
-+++ seahub-3.1.7-server/seahub/settings.py     2014-12-10 15:47:21.625104606 +0100
-@@ -46,7 +46,7 @@ SITE_ID = 1
+--- a/seahub/settings.py
++++ b/seahub/settings.py
+@@ -47,7 +47,7 @@ SITE_ID = 1
  
  # If you set this to False, Django will make some optimizations so as not
  # to load the internationalization machinery.
@@ -10,8 +9,8 @@ diff -rupN seahub-3.1.7-server.orig/seahub/settings.py seahub-3.1.7-server/seahu
  
  # If you set this to False, Django will not format dates, numbers and
  # calendars according to the current locale.
-@@ -209,7 +209,7 @@ SHOW_REPO_DOWNLOAD_BUTTON = False
- REPO_PASSWORD_MIN_LENGTH = 8
+@@ -310,7 +310,7 @@ SHARE_LINK_EMAIL_LANGUAGE = ''
+ ENABLE_UPLOAD_LINK_VIRUS_CHECK = False
  
  # mininum length for user's password
 -USER_PASSWORD_MIN_LENGTH = 6
@@ -19,12 +18,12 @@ diff -rupN seahub-3.1.7-server.orig/seahub/settings.py seahub-3.1.7-server/seahu
  
  # LEVEL based on four types of input:
  # num, upper letter, lower letter, other symbols
-@@ -218,7 +218,7 @@ USER_PASSWORD_STRENGTH_LEVEL = 3
+@@ -319,7 +319,7 @@ USER_PASSWORD_STRENGTH_LEVEL = 3
  
  # default False, only check USER_PASSWORD_MIN_LENGTH
  # when True, check password strength level, STRONG(or above) is allowed
 -USER_STRONG_PASSWORD_REQUIRED = False
 +USER_STRONG_PASSWORD_REQUIRED = True
  
- # Using server side crypto by default, otherwise, let user choose crypto method.
- FORCE_SERVER_CRYPTO = True
+ # Force user to change password when admin add/reset a user.
+ FORCE_PASSWORD_CHANGE = True

diff --git a/net/seafile-seahub/patches/020-Makefile-fixes.patch b/net/seafile-seahub/patches/020-Makefile-fixes.patch
index efae34d131262ceefd22af0847f84c1f55e415e7..35f4f93fef28201a207ae5246138f3834db474e8 100644 (file)
--- a/net/seafile-seahub/patches/020-Makefile-fixes.patch
+++ b/net/seafile-seahub/patches/020-Makefile-fixes.patch
@@ -1,6 +1,5 @@
-diff -rupN seafile-seahub-6.2.2.orig/Makefile seafile-seahub-6.2.2/Makefile
---- seafile-seahub-6.2.2.orig/Makefile 2017-10-22 22:28:22.000000000 +0200
-+++ seafile-seahub-6.2.2/Makefile      2017-10-22 22:46:18.007470936 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,3 +1,6 @@
 +include $(TOPDIR)/rules.mk
 +include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
@@ -8,18 +7,16 @@ diff -rupN seafile-seahub-6.2.2.orig/Makefile seafile-seahub-6.2.2/Makefile
  PROJECT=seahub
  
  develop: setup-git
-@@ -9,7 +12,9 @@ dist: locale uglify statici18n collectst
+@@ -9,7 +12,7 @@ dist: locale uglify statici18n collectst
  
  locale:
        @echo "--> Compile locales"
--      django-admin.py compilemessages && cd seahub/two_factor && django-admin.py compilemessages
-+      $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages)
-+      cd seahub/two_factor
+-      django-admin.py compilemessages
 +      $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages)
        @echo ""
  
  uglify:
-@@ -19,17 +24,17 @@ uglify:
+@@ -19,17 +22,17 @@ uglify:
  
  statici18n:
        @echo "--> Generate JS locale files in static/scripts/i18n"