updpkg: 6.3.1

6 files changed, 61 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98d03cb70b3a..c54c01eeced3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = seafile-server
 	pkgdesc = Seafile server core
-	pkgver = 6.3.0
+	pkgver = 6.3.1
 	pkgrel = 1
 	url = https://github.com/haiwen/seafile-server
 	changelog = ChangeLog
@@ -11,23 +11,20 @@ pkgbase = seafile-server
 	arch = aarch64
 	license = AGPL3
 	makedepends = vala
-	depends = ccnet-server>=6.3.0
+	depends = ccnet-server>=6.3.1
 	depends = fuse2
 	depends = libevhtp-seafile
 	depends = libarchive
-	optdepends = python2-wsgidav-seafile: webdav-support
 	conflicts = seafile
-	source = seafile-server-6.3.0-server.tar.gz::https://github.com/haiwen/seafile-server/archive/v6.3.0-server.tar.gz
+	source = https://github.com/haiwen/seafile-server/archive/v6.3.1-server.tar.gz
 	source = fix_pids-folder-out-of-seafile-data.diff
 	source = fix_seafile-admin.diff
 	source = fix_mysql_support.diff
-	source = fix_scripts_upgrade.diff
 	source = seafile-server@.service
-	sha256sums = 056013b496a8b5501a32011288416982609797108ba5a9d3213f9574abb5fd85
+	sha256sums = ccde67afe34baeea076e9bbfe98328d9328dadcafd915dc9f1ddbca3d2e0d9fe
 	sha256sums = d725bda36aedd424d426d7ce62e19c7036ccfc6a5759df12f139656ba15e425c
-	sha256sums = 6d456c0795bdf50c64c9f40d0fb725f6d356ff9638ec1b0c7921a11e4dd479d4
-	sha256sums = 9e50942e1f9cad21744b4467646e162896705d2c67834b600d78d4aa87b87a39
-	sha256sums = bc23410381f380c419d9d5bb0757af136d96cfa8815e9ec7e0caa759d9d3a27d
+	sha256sums = 51a7f13b8c3dfcb3f510c68c9791bf6ace1a0b332ba26fdf55c850409bf387fa
+	sha256sums = d625d1ac5fc666386a53059b1d31bce0e63c79b69c11bfb769f6390afb629611
 	sha256sums = da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4
 
 pkgname = seafile-server
diff --git a/ChangeLog b/ChangeLog
index 36ac2f1e40a8..c8c76fc92f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-15 Joffrey <j-off@live.fr>
+	* Version: 6.3.1-1
+
+	* *.diff: Remove patchs for python virtualenv
+
 2018-06-03 Joffrey <j-off@live.fr>
 	* Version: 6.3.0-1
 
diff --git a/PKGBUILD b/PKGBUILD
index cfda8d61a282..0021ef86155b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,80 +3,77 @@
 # Contributor: Edvinas Valatka <edacval@gmail.com>
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
-pkgname=seafile-server
-pkgver=6.3.0
+pkgname='seafile-server'
+pkgver='6.3.1'
 pkgrel=1
-pkgdesc="Seafile server core"
+pkgdesc='Seafile server core'
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
-url="https://github.com/haiwen/${pkgname}"
+url='https://github.com/haiwen/seafile-server'
 license=('AGPL3')
-depends=("ccnet-server>=${pkgver}" "fuse2" "libevhtp-seafile" "libarchive")
-makedepends=("vala")
-optdepends=("python2-wsgidav-seafile: webdav-support")
+depends=(
+	"ccnet-server>=$pkgver"
+	'fuse2'
+	'libevhtp-seafile'
+	'libarchive'
+)
+makedepends=('vala')
 conflicts=('seafile')
-changelog="ChangeLog"
-source=("${pkgname}-${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
-        "fix_pids-folder-out-of-seafile-data.diff"
-        "fix_seafile-admin.diff"
-        "fix_mysql_support.diff"
-        "fix_scripts_upgrade.diff"
-        "seafile-server@.service"
+changelog='ChangeLog'
+source=(
+	"https://github.com/haiwen/$pkgname/archive/v$pkgver-server.tar.gz"
+	'fix_pids-folder-out-of-seafile-data.diff'
+	'fix_seafile-admin.diff'
+	'fix_mysql_support.diff'
+	'seafile-server@.service'
 )
-sha256sums=('056013b496a8b5501a32011288416982609797108ba5a9d3213f9574abb5fd85'
-            'd725bda36aedd424d426d7ce62e19c7036ccfc6a5759df12f139656ba15e425c'
-            '6d456c0795bdf50c64c9f40d0fb725f6d356ff9638ec1b0c7921a11e4dd479d4'
-            '9e50942e1f9cad21744b4467646e162896705d2c67834b600d78d4aa87b87a39'
-            'bc23410381f380c419d9d5bb0757af136d96cfa8815e9ec7e0caa759d9d3a27d'
-            'da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4'
+sha256sums=(
+	'ccde67afe34baeea076e9bbfe98328d9328dadcafd915dc9f1ddbca3d2e0d9fe'
+	'd725bda36aedd424d426d7ce62e19c7036ccfc6a5759df12f139656ba15e425c'
+	'51a7f13b8c3dfcb3f510c68c9791bf6ace1a0b332ba26fdf55c850409bf387fa'
+	'd625d1ac5fc666386a53059b1d31bce0e63c79b69c11bfb769f6390afb629611'
+	'da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4'
 )
 
 prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
-
+    cd "$srcdir/$pkgname-$pkgver-server"
     # Remove scripts for tests and others OS
     rm -rf "./scripts/"{build,upgrade/win32,*.bat,*.md} "./integration-tests"
 
+    # Apply patchs
     sed -i "s|(DESTDIR)@prefix@|@prefix@|" "./lib/libseafile.pc.in"
+    for diff in "$srcdir"/*.diff; do patch -p1 -i "$diff"; done
 
-    patch -p1 -i "${srcdir}/fix_pids-folder-out-of-seafile-data.diff"
-    patch -p1 -i "${srcdir}/fix_seafile-admin.diff"
-    patch -p1 -i "${srcdir}/fix_mysql_support.diff"
-    patch -p1 -i "${srcdir}/fix_scripts_upgrade.diff"
-
-    # Use python lib seahub interpreter for all scripts
-    grep -s -l -r '#!/usr/bin/env python' "./" \
-    | xargs sed -i -e '1 s|#!/usr/bin/env python|#!/usr/lib/seahub/bin/python2|'
-
-    grep -s -l -r -E "PYTHON=python[.0-9]+" "./" \
-    | xargs sed -i -E 's|PYTHON=python[.0-9]+|PYTHON=/usr/lib/seahub/bin/python2|g'
+    # Fix python path
+    shebang='#!/usr/bin/env python'; pyenv='PYTHON=python[.0-9]+' 
+    grep -s -l -r    "$shebang" | xargs sed -i -E "1 s|$shebang|${shebang}2|"
+    grep -s -l -r -E "$pyenv"   | xargs sed -i -E "s|$pyenv|PYTHON=python2|g"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
-
+    cd "$srcdir/$pkgname-$pkgver-server"
     ./autogen.sh
     ./configure \
-        --enable-fuse --enable-python \
-        --prefix=/usr PYTHON=/usr/bin/python2
+        --enable-fuse \
+        --enable-python \
+        --prefix=/usr \
+        PYTHON='/usr/bin/python2'
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
-
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/$pkgname-$pkgver-server"
+    make DESTDIR="$pkgdir" install
 
-    # Prepare directories layout for an easy deploying
-    # https://manual.seafile.com/deploy/using_mysql.html
-    mkdir -p "${pkgdir}/usr/share/${pkgname}/runtime"
-    cp -r -p "./scripts" "${pkgdir}/usr/share/${pkgname}/scripts"
+    # Prepare directories layout for deploying
+    mkdir -p "$pkgdir/usr/share/$pkgname/runtime"
+    cp -r -p "./scripts" "$pkgdir/usr/share/$pkgname/scripts"
 
-    mv "${pkgdir}/usr/share/${pkgname}/scripts/seahub.conf" \
-       "${pkgdir}/usr/share/${pkgname}/runtime/"
-    mv "${pkgdir}/usr/share/${pkgname}/scripts/upgrade" \
-       "${pkgdir}/usr/share/${pkgname}/"
+    mv "$pkgdir/usr/share/$pkgname/scripts/seahub.conf" \
+       "$pkgdir/usr/share/$pkgname/runtime/"
+    mv "$pkgdir/usr/share/$pkgname/scripts/upgrade" \
+       "$pkgdir/usr/share/$pkgname/"
 
-    # Install systemd service
-    install -Dm644 "${srcdir}/seafile-server@.service" \
-                   "${pkgdir}/usr/lib/systemd/system/seafile-server@.service"
+    install -Dm644 \
+		"$srcdir/seafile-server@.service" \
+        "$pkgdir/usr/lib/systemd/system/seafile-server@.service"
 }
diff --git a/fix_mysql_support.diff b/fix_mysql_support.diff
index e9a3aa26a9f1..6920d16f6c81 100644
--- a/fix_mysql_support.diff
+++ b/fix_mysql_support.diff
@@ -1,15 +1,3 @@
-diff --git a/scripts/setup-seafile-mysql.sh b/scripts/setup-seafile-mysql.sh
-index cb8b8c5..a8f18df 100755
---- a/scripts/setup-seafile-mysql.sh
-+++ b/scripts/setup-seafile-mysql.sh
-@@ -8,6 +8,7 @@ set -e
- 
- SCRIPT=$(readlink -f "$0")
- INSTALLPATH=$(dirname "${SCRIPT}")
-+PYTHON='/usr/lib/seahub/bin/python2'
- 
- cd "$INSTALLPATH"
- 
 diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py
 index 596687c..39ed520 100644
 --- a/scripts/setup-seafile-mysql.py
diff --git a/fix_scripts_upgrade.diff b/fix_scripts_upgrade.diff
deleted file mode 100644
index f78d7b0f5cdc..000000000000
--- a/fix_scripts_upgrade.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/scripts/upgrade/upgrade_6.2_6.3.sh b/scripts/upgrade/upgrade_6.2_6.3.sh
-index f09d03c..d5951ed 100755
---- a/scripts/upgrade/upgrade_6.2_6.3.sh
-+++ b/scripts/upgrade/upgrade_6.2_6.3.sh
-@@ -20,6 +20,8 @@ export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.6/site-packages:${INSTALLPA
- export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.7/site-packages:${INSTALLPATH}/seafile/lib64/python2.7/site-packages:$PYTHONPATH
- export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
- 
-+PYTHON=/usr/lib/seahub/bin/python2.7
-+
- prev_version=6.2
- current_version=6.3
diff --git a/fix_seafile-admin.diff b/fix_seafile-admin.diff
index 42a29646ff72..1f9ed05d3a76 100644
--- a/fix_seafile-admin.diff
+++ b/fix_seafile-admin.diff
@@ -7,7 +7,7 @@ index 5e3658b..90c68a8 100755
  SCRIPT_NAME = os.path.basename(sys.argv[0])
  
 -PYTHON = sys.executable
-+PYTHON = '/usr/lib/seahub/bin/python2.7'
++PYTHON = '/usr/bin/python2.7'
  
  conf = {}
  CONF_SERVER_NAME = 'server_name'
@@ -39,7 +39,7 @@ index 5e3658b..90c68a8 100755
  def start_seahub_gunicorn():
      argv = [
 -        'gunicorn',
-+        '/usr/lib/seahub/bin/gunicorn',
++        'gunicorn-python2',
          'seahub.wsgi:application',
          '-c',
          conf[CONF_SEAHUB_CONF],