updpkg: 11.0.3

Remove Fix_Pillow_ANTIALIAS_deprecation.diff

Add python-ldap and python-django-saml2 deps

Use Django official package

3 files changed, 14 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11e56d5f2b3b..b45353121aa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = seahub
 	pkgdesc = The web frontend for seafile server
-	pkgver = 10.0.1
-	pkgrel = 2
+	pkgver = 11.0.3
+	pkgrel = 1
 	url = https://github.com/haiwen/seahub
 	arch = any
 	license = Apache
-	depends = seafile-server>=10.0.1
+	depends = seafile-server>=11.0.3
 	depends = python-setuptools
 	depends = python-django
 	depends = python-django-statici18n
@@ -13,6 +13,7 @@ pkgbase = seahub
 	depends = python-django-picklefield
 	depends = python-django-formtools
 	depends = python-django-simple-captcha
+	depends = python-django-saml2
 	depends = python-django-rest-framework
 	depends = python-dateutil
 	depends = python-pyjwt
@@ -25,26 +26,21 @@ pkgbase = seahub
 	depends = python-qrcode
 	depends = python-pillow
 	depends = python-chardet
-	depends = python-openpyxl
 	depends = python-cffi
+	depends = python-openpyxl
 	depends = python-markdown
 	depends = python-bleach
+	depends = python-ldap
 	optdepends = python-pymysql: Installation script
-	optdepends = python-pysaml2: SSO support
-	optdepends = python-django-saml2: SSO support
 	optdepends = python-wsgidav-seafile: Webdav support
 	optdepends = python-django-pylibmc: Memcached support
 	optdepends = ffmpeg: For video thumbnails
 	options = !strip
-	source = seahub-10.0.1-server.tar.gz::https://github.com/haiwen/seahub/archive/v10.0.1-server.tar.gz
-	source = django-3.2.18.tar.gz::https://github.com/django/django/archive/3.2.18.tar.gz
+	source = seahub-11.0.3-server.tar.gz::https://github.com/haiwen/seahub/archive/v11.0.3-server.tar.gz
 	source = seahub@.service
 	source = nginx.example.conf
-	source = Fix_Pillow_ANTIALIAS_deprecation.diff
-	sha256sums = 4df0697ea9ed62ceb53f2f17dcc35f4abf2b69f276c87c913bb30a72f6007cb2
-	sha256sums = b7894330d7fd9a268cf5b430b09db111508c5f7a98fa4ffc8c0b88aada9b6dbf
+	sha256sums = 0dd8115f0e82079d06c6a6c01edb19f34ef211438b67059436e2e57362e548c8
 	sha256sums = 67bb375871ce908b48bef53277284c9d8f80ee2e733efc89cb66d987647195e4
 	sha256sums = 461591ba500d012523d6fdecbcc230461f6fd8d708b92eefdedc8b93b1542171
-	sha256sums = 4672793c24577875446b62766af37aed25169f0b764ea14c97c1ab0942403ec0
 
 pkgname = seahub
diff --git a/Fix_Pillow_ANTIALIAS_deprecation.diff b/Fix_Pillow_ANTIALIAS_deprecation.diff
deleted file mode 100644
index 232fed1dbdaa..000000000000
--- a/Fix_Pillow_ANTIALIAS_deprecation.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/seahub/avatar/settings.py b/seahub/avatar/settings.py
-index 7fb436230..be6981c47 100644
---- a/seahub/avatar/settings.py
-+++ b/seahub/avatar/settings.py
-@@ -22,7 +22,7 @@ AUTO_GENERATE_GROUP_AVATAR_SIZES = getattr(settings, 'AUTO_GENERATE_GROUP_AVATAR
- 
- ### Common settings ###
- AVATAR_FILE_STORAGE = getattr(settings, 'AVATAR_FILE_STORAGE', '')
--AVATAR_RESIZE_METHOD = getattr(settings, 'AVATAR_RESIZE_METHOD', Image.ANTIALIAS)
-+AVATAR_RESIZE_METHOD = getattr(settings, 'AVATAR_RESIZE_METHOD', Image.LANCZOS)
- AVATAR_GRAVATAR_BACKUP = getattr(settings, 'AVATAR_GRAVATAR_BACKUP', True)
- AVATAR_GRAVATAR_DEFAULT = getattr(settings, 'AVATAR_GRAVATAR_DEFAULT', None)
- AVATAR_MAX_AVATARS_PER_USER = getattr(settings, 'AVATAR_MAX_AVATARS_PER_USER', 42)
-diff --git a/seahub/thumbnail/utils.py b/seahub/thumbnail/utils.py
-index d05e9544a..7e69ec337 100644
---- a/seahub/thumbnail/utils.py
-+++ b/seahub/thumbnail/utils.py
-@@ -230,7 +230,7 @@ def _create_thumbnail_common(fp, thumbnail_file, size):
-         image = image.convert("RGB")
- 
-     image = get_rotated_image(image)
--    image.thumbnail((size, size), Image.ANTIALIAS)
-+    image.thumbnail((size, size), Image.LANCZOS)
-     image.save(thumbnail_file, THUMBNAIL_EXTENSION)
-     return (True, 200)
- 
diff --git a/PKGBUILD b/PKGBUILD
index a4fa1088d54d..c7fa0c4ba02f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=seahub
-pkgver=10.0.1
-pkgrel=2
+pkgver=11.0.3
+pkgrel=1
 pkgdesc='The web frontend for seafile server'
 arch=('any')
 url='https://github.com/haiwen/seahub'
@@ -19,6 +19,7 @@ depends=(
     'python-django-picklefield'
     'python-django-formtools'
     'python-django-simple-captcha'
+    'python-django-saml2'
     'python-django-rest-framework'
     'python-dateutil'
     'python-pyjwt'
@@ -31,44 +32,33 @@ depends=(
     'python-qrcode'
     'python-pillow'
     'python-chardet'
-    'python-openpyxl'
     'python-cffi'
+    'python-openpyxl'
     'python-markdown'
     'python-bleach'
+    'python-ldap'
 )
 optdepends=(
     'python-pymysql: Installation script'
-    'python-pysaml2: SSO support'
-    'python-django-saml2: SSO support'
     'python-wsgidav-seafile: Webdav support'
     'python-django-pylibmc: Memcached support'
     'ffmpeg: For video thumbnails'
 )
-# Outdated Python modules, but required by Seahub
-_thirdpart=(
-    'django-3.2.18'
-)
 source=(
     "$pkgname-$pkgver-server.tar.gz::$url/archive/v$pkgver-server.tar.gz"
-    "${_thirdpart[0],,}.tar.gz::https://github.com/django/${_thirdpart[0]%-*}/archive/${_thirdpart[0]##*-}.tar.gz"
     'seahub@.service'
     'nginx.example.conf'
-    'Fix_Pillow_ANTIALIAS_deprecation.diff'
 )
 sha256sums=(
-    '4df0697ea9ed62ceb53f2f17dcc35f4abf2b69f276c87c913bb30a72f6007cb2'
-    'b7894330d7fd9a268cf5b430b09db111508c5f7a98fa4ffc8c0b88aada9b6dbf'
+    '0dd8115f0e82079d06c6a6c01edb19f34ef211438b67059436e2e57362e548c8'
     '67bb375871ce908b48bef53277284c9d8f80ee2e733efc89cb66d987647195e4'
     '461591ba500d012523d6fdecbcc230461f6fd8d708b92eefdedc8b93b1542171'
-    '4672793c24577875446b62766af37aed25169f0b764ea14c97c1ab0942403ec0'
 )
 options=('!strip')
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver-server"
 
-    patch -p1 -i "$srcdir/Fix_Pillow_ANTIALIAS_deprecation.diff"
-
     # Remove useless files and directories
     rm -rf \
         ./{CONTRIBUTORS,HACKING,Makefile} \
@@ -101,16 +91,6 @@ package() {
     mv "$pkgdir/usr/share/seafile-server/seahub/scripts/"* \
         "$pkgdir/usr/share/seafile-server"
 
-    # Install third part
-    for thirdpart in "${_thirdpart[@]}"; do
-        cd "$srcdir/$thirdpart"
-        python setup.py install \
-            --root="$pkgdir/" \
-            --install-lib="usr/share/seafile-server/$pkgname/thirdpart" \
-            --optimize=0
-    done
-    rm -rf "$pkgdir"/usr/{bin,share/seafile-server/"$pkgname"/thirdpart/*.egg-info}
-
     python -m compileall -f -j 0 -o 1 \
         -s "$pkgdir" -p / "$pkgdir/usr/share/seafile-server/seahub"