diff options
-rw-r--r-- | .SRCINFO | 65 | ||||
-rw-r--r-- | 0001-Revert-server-put-pids-folder-out-of-seafile-data.patch | 27 | ||||
-rw-r--r-- | PKGBUILD | 121 | ||||
-rw-r--r-- | create-default-conf-dir.patch | 10 | ||||
-rw-r--r-- | seafile-admin_virtualenv.patch | 17 | ||||
-rwxr-xr-x | seafile-server.install | 38 | ||||
-rw-r--r-- | seafile-server@.service | 14 | ||||
-rwxr-xr-x | seahub-preupgrade | 29 |
8 files changed, 28 insertions, 293 deletions
@@ -1,67 +1,26 @@ # Generated by mksrcinfo v8 -# Sun Sep 11 17:49:17 UTC 2016 +# Sat Jan 7 15:02:37 UTC 2017 pkgbase = seafile pkgdesc = Seafile is an online file storage and collaboration tool - pkgver = 6.0.0 - pkgrel = 2 + pkgver = 6.0.2 + pkgrel = 1 url = https://github.com/haiwen/seafile arch = i686 arch = x86_64 arch = armv7h arch = armv6h - license = GPL3 + license = GPL2 makedepends = vala makedepends = intltool - makedepends = python2 - makedepends = sqlite - makedepends = fuse - makedepends = ccnet>=6.0.0 - makedepends = libevhtp-seafile - source = seafile-server-6.0.0.tar.gz::https://github.com/haiwen/seafile/archive/v6.0.0-server.tar.gz - source = seafile-admin_virtualenv.patch - source = seafile-server@.service - source = seahub-preupgrade - source = create-default-conf-dir.patch - source = 0001-Revert-server-put-pids-folder-out-of-seafile-data.patch + depends = ccnet + depends = fuse + depends = python2 + depends = sqlite + depends = libevhtp-seafile + source = seafile-6.0.2.tar.gz::https://github.com/haiwen/seafile/archive/v6.0.2.tar.gz source = libseafile.in.patch - sha256sums = 778b4248c6596f25d337ea18b9422eeb6950c9b86456ac535c0f7c2fd5e8148f - sha256sums = 52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218 - sha256sums = ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421 - sha256sums = 333b78e2ac2ce03b243a70223975bfb0f8e1998edc074b4307c9a96df1b5883f - sha256sums = 6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78 - sha256sums = b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29 + sha256sums = 0d0276a67eb705535f91f9c3f59d43f55877112361e4817a144e81e0e14c1360 sha256sums = a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076 -pkgname = seafile-server - pkgdesc = Seafile server components, without seahub - install = seafile-server.install - depends = seafile-shared - depends = wget - depends = python2-mako - depends = python2-dateutil - depends = python2-webpy - depends = python2-pip - depends = python2-virtualenv - depends = python2-flup - depends = python2-six - depends = python2-chardet - depends = python2-simplejson - depends = libevhtp-seafile - depends = git - optdepends = libmariadbclient: mysql server support - conflicts = seafile-shared<6.0.0 - options = !libtool - options = !emptydirs - -pkgname = seafile-client-cli - pkgdesc = Seafile cli client - depends = seafile-shared - depends = libevent - conflicts = seafile-shared<6.0.0 - -pkgname = seafile-shared - pkgdesc = Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals) - depends = ccnet - depends = fuse - conflicts = ccnet<6.0.0 +pkgname = seafile diff --git a/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch b/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch deleted file mode 100644 index da417f87ae96..000000000000 --- a/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a241e334aa22e66b0469a3899d73db7df4b6e274 Mon Sep 17 00:00:00 2001 -From: Moritz Maxeiner <moritz@ucworks.org> -Date: Mon, 28 Apr 2014 04:42:11 +0200 -Subject: [PATCH] Revert "[server] put pids/ folder out of seafile-data/" - -This reverts commit 54926205490f9efcd16d22c4bc178576d50449ef. ---- - controller/seafile-controller.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/controller/seafile-controller.c b/controller/seafile-controller.c -index c5bc425..a1a9358 100644 ---- a/controller/seafile-controller.c -+++ b/controller/seafile-controller.c -@@ -611,7 +611,7 @@ stop_ccnet_server () - static void - init_pidfile_path (SeafileController *ctl) - { -- char *pid_dir = g_build_filename (topdir, "pids", NULL); -+ char *pid_dir = g_build_filename (ctl->seafile_dir, "pids", NULL); - if (!g_file_test(pid_dir, G_FILE_TEST_EXISTS)) { - if (g_mkdir(pid_dir, 0777) < 0) { - seaf_warning("failed to create pid dir %s: %s", pid_dir, strerror(errno)); --- -1.9.2 - - @@ -2,134 +2,45 @@ # Contributor: Edvinas Valatka <edacval@gmail.com> # Contributor: Aaron Lindsay <aaron@aclindsay.com> -pkgbase=seafile -pkgname=('seafile-server' 'seafile-client-cli' 'seafile-shared') -pkgver=6.0.0 -pkgrel=2 +pkgname=seafile +pkgver=6.0.2 +pkgrel=1 pkgdesc="Seafile is an online file storage and collaboration tool" arch=('i686' 'x86_64' 'armv7h' 'armv6h') -url="https://github.com/haiwen/seafile" -license=('GPL3') -makedepends=("vala" "intltool" - "python2" "sqlite" "fuse" - "ccnet>=${pkgver}" "libevhtp-seafile") -source=("seafile-server-${pkgver}.tar.gz::${url}/archive/v${pkgver}-server.tar.gz" - "seafile-admin_virtualenv.patch" - "seafile-server@.service" - "seahub-preupgrade" - "create-default-conf-dir.patch" - "0001-Revert-server-put-pids-folder-out-of-seafile-data.patch" +url="https://github.com/haiwen/${pkgname}" +license=('GPL2') +depends=("ccnet" "fuse" "python2" "sqlite" "libevhtp-seafile") +makedepends=("vala" "intltool") +source=("seafile-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" "libseafile.in.patch") -sha256sums=('778b4248c6596f25d337ea18b9422eeb6950c9b86456ac535c0f7c2fd5e8148f' - '52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218' - 'ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421' - '333b78e2ac2ce03b243a70223975bfb0f8e1998edc074b4307c9a96df1b5883f' - '6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78' - 'b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29' +sha256sums=('0d0276a67eb705535f91f9c3f59d43f55877112361e4817a144e81e0e14c1360' 'a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076') prepare () { - cd "${srcdir}/seafile-${pkgver}-server" + cd "${srcdir}/seafile-${pkgver}" - patch -p1 -i "${srcdir}/seafile-admin_virtualenv.patch" - patch -p1 -i "${srcdir}/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch" - patch -p1 -i "${srcdir}/create-default-conf-dir.patch" patch -p1 -i "${srcdir}/libseafile.in.patch" # Fix all script's python 2 requirement - grep -s -l -r '#!/usr/bin/env python' "${srcdir}/seafile-${pkgver}-server" \ + grep -s -l -r '#!/usr/bin/env python' "${srcdir}/seafile-${pkgver}" \ | xargs sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' } build() { - cd "$srcdir/seafile-${pkgver}-server" + cd "$srcdir/seafile-${pkgver}" ./autogen.sh ./configure \ - --enable-client \ - --enable-fuse \ - --enable-python \ - --enable-server \ + --enable-console \ --prefix=/usr \ - PYTHON=/usr/bin/python2 \ - CFLAGS="${CFLAGS} -I/usr/include/evhtp" + PYTHON=/usr/bin/python2 make } -package_seafile-client-cli() { - depends=("seafile-shared" "libevent") - conflicts=("seafile-shared<${pkgver}") - pkgdesc="Seafile cli client" +package() { + cd "${srcdir}/seafile-${pkgver}" - cd "${srcdir}/seafile-${pkgver}-server" - - # Install cli client - install -D -m755 app/seaf-cli "${pkgdir}/usr/bin/seaf-cli" -} - -package_seafile-shared() { - depends=("ccnet" "fuse") - conflicts=("ccnet<${pkgver}") - pkgdesc="Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals)" - - cd "${srcdir}/seafile-${pkgver}-server" - - make DESTDIR="${pkgdir}" install - - # Remove server components - rm -rf "${pkgdir}/usr/bin/seafserv-gc" - rm -rf "${pkgdir}/usr/bin/seafile-admin" - rm -rf "${pkgdir}/usr/bin/seaf-fuse" - rm -rf "${pkgdir}/usr/bin/seaf-server" - rm -rf "${pkgdir}/usr/bin/seaf-server-init" - rm -rf "${pkgdir}/usr/bin/seaf-migrate" - rm -rf "${pkgdir}/usr/bin/seaf-fsck" - # Remove cli client binary - rm -rf "${pkgdir}/usr/bin/seaf-cli" -} - -package_seafile-server() { - depends=("seafile-shared" "wget" - "python2-mako" "python2-dateutil" "python2-webpy" "python2-pip" - "python2-virtualenv" "python2-flup" "python2-six" "python2-chardet" - "python2-simplejson" "libevhtp-seafile" "git") - optdepends=('libmariadbclient: mysql server support' ) - conflicts=("seafile-shared<${pkgver}") - options=('!libtool' '!emptydirs') - install=seafile-server.install - pkgdesc="Seafile server components, without seahub" - - # Install library and header files - cd "${srcdir}/seafile-${pkgver}-server" make DESTDIR="${pkgdir}" install - - # Remove files already installed by seafile-shared - # to maintain compatibility - rm -rf "${pkgdir}/usr/lib" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/bin/seaf-daemon" - rm -rf "${pkgdir}/usr/bin/seafile-controller" - - # Remove seafile-client-cli - rm -rf "${pkgdir}/usr/bin/seaf-cli" - - # Install all scripts - mkdir -p "${pkgdir}/usr/share/${pkgname}" - cp -r -p "${srcdir}/seafile-${pkgver}-server/scripts" \ - "${pkgdir}/usr/share/$pkgname/scripts" - - # Remove win32 and other distributions specific scripts - rm -rf "${pkgdir}/usr/share/$pkgname/scripts/build" - rm -rf "${pkgdir}/usr/share/$pkgname/scripts/upgrade/win32" - - # Install systemd service - install -D -m644 "${srcdir}/seafile-server@.service" \ - "${pkgdir}/usr/lib/systemd/system/seafile-server@.service" - - # Install seahub preupgrade script - install -D -m755 "${srcdir}/seahub-preupgrade" \ - "${pkgdir}/usr/bin/seahub-preupgrade" } diff --git a/create-default-conf-dir.patch b/create-default-conf-dir.patch deleted file mode 100644 index 2c4507c8978e..000000000000 --- a/create-default-conf-dir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/scripts/upgrade/upgrade_4.4_5.0.sh -+++ a/scripts/upgrade/upgrade_4.4_5.0.sh -@@ -206,6 +206,7 @@ - $seafile_data_dir/seafile.conf - $seahub_settings_py - ) -+ mkdir -p $default_conf_dir - for conffile in ${confs[*]}; do - if grep -q "This file has been moved" $conffile; then - continue diff --git a/seafile-admin_virtualenv.patch b/seafile-admin_virtualenv.patch deleted file mode 100644 index 6a26e2710675..000000000000 --- a/seafile-admin_virtualenv.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/tools/seafile-admin -+++ b/tools/seafile-admin -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/lib/seafile/seafileenv/bin/python2 - # coding: UTF-8 - '''This is the helper script to setup/manage your seafile server - ''' -@@ -683,7 +683,7 @@ - - def start_seahub_gunicorn(): - argv = [ -- 'gunicorn', -+ '/usr/lib/seafile/seafileenv/bin/gunicorn', - 'seahub.wsgi:application', - '-c', - conf[CONF_SEAHUB_CONF], diff --git a/seafile-server.install b/seafile-server.install deleted file mode 100755 index 752be34c89ff..000000000000 --- a/seafile-server.install +++ /dev/null @@ -1,38 +0,0 @@ -pre_install() { - rm -rf /usr/lib/seafile - virtualenv2 --system-site-packages /usr/lib/seafile/seafileenv - virtualenv2 --relocatable /usr/lib/seafile/seafileenv - source /usr/lib/seafile/seafileenv/bin/activate - - pip2 install "Django==1.8.10" - pip2 install "django-statici18n==1.1.2" - pip2 install "django-compressor==1.4" - pip2 install "git+git://github.com/haiwen/django-constance.git@bde7f7cdfd0ed1631a6817fd4cd76f37bf54fe35#egg=django-constance[database]" - pip2 install "openpyxl==2.3.0" - pip2 install "pytz==2015.7" - pip2 install "djangorestframework==3.3.1" - pip2 install "django-post-office==2.0.3" - pip2 install "Pillow>=2.6.1,<3.0.0" - pip2 install "python-memcached==1.57" - pip2 install gunicorn - deactivate -} - - -post_install() { - systemctl daemon-reload -} - -pre_upgrade() { - rm -rf /usr/lib/seafile - pre_install -} - -post_upgrade() { - post_install -} - -post_remove() { - rm -rf /usr/lib/seafile - post_install -} diff --git a/seafile-server@.service b/seafile-server@.service deleted file mode 100644 index 2f65a2aa78fd..000000000000 --- a/seafile-server@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Next-generation open source cloud storage with advanced features on privacy protection and teamwork. -After=syslog.target network.target - -[Service] -Type=forking -User=seafile -WorkingDirectory=/srv/seafile/%i -ExecStart=/usr/bin/seafile-admin start --fastcgi -ExecStop=/usr/bin/seafile-admin stop -PIDFile=/srv/seafile/%i/seafile-data/pids/seaf-server.pid - -[Install] -WantedBy=multi-user.target diff --git a/seahub-preupgrade b/seahub-preupgrade deleted file mode 100755 index 10241dc9e751..000000000000 --- a/seahub-preupgrade +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh - -if [ "$(basename $(pwd))" != "seafile-server" ]; then - echo "Must be run from within a seafile server instance's 'seafile-server' subdirectory" - exit 1 -fi - -echo "Please ensure that the seafile server is stopped, then press [ENTER] to proceed" -read - -SEAFILE_VERSION="$(LANG=C pacman -Qi seafile-server | grep Version | sed 's|[^\n]*: \(.*\)-.*|\1|g')" - -echo "Preparing local seahub for upgrade..." - -# Ensure newest upgrade scripts are available -rm -rf ./upgrade -cp -a /usr/share/seafile-server/scripts/upgrade ./ -# Use python2 -sed -i -e 's/python $seahub_secret_keygen/python2 $seahub_secret_keygen/g' upgrade/regenerate_secret_key.sh -# Ready old seahub version -rm -rf seahub-old -mv seahub seahub-old - -# Ready new seahub version -curl -fLC - --retry 3 --retry-delay 3 -O "https://github.com/haiwen/seahub/archive/v${SEAFILE_VERSION}-server.tar.gz" -tar -xzf v${SEAFILE_VERSION}-server.tar.gz -mv "seahub-${SEAFILE_VERSION}-server" seahub - -echo "Done, you should now execute the appropriate upgrade script by calling './upgrade/SCRIPT'." |