Browse Source
seafile: import version 5.1.1 and its dependencies
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>lilik-openwrt-22.03
Gergely Kiss
9 years ago
committed by
Etienne CHAMPETIER
Etienne CHAMPETIER
40 changed files with 1655 additions and 758 deletions
Split View
Diff Options
-
+53 -0lang/chardet/Makefile
-
+48 -0lang/django-appconf/Makefile
-
+49 -0lang/django-compressor/Makefile
-
+48 -0lang/django-constance/Makefile
-
+48 -0lang/django-jsonfield/Makefile
-
+48 -0lang/django-picklefield/Makefile
-
+49 -0lang/django-postoffice/Makefile
-
+49 -0lang/django-restframework/Makefile
-
+48 -0lang/django-statici18n/Makefile
-
+65 -0lang/django/Makefile
-
+48 -0lang/et_xmlfile/Makefile
-
+48 -0lang/flup/Makefile
-
+53 -0lang/gunicorn/Makefile
-
+48 -0lang/jdcal/Makefile
-
+48 -0lang/openpyxl/Makefile
-
+48 -0lang/python-dateutil/Makefile
-
+48 -0lang/pytz/Makefile
-
+57 -0lang/rcssmin/Makefile
-
+3 -3lang/simplejson/Makefile
-
+48 -0lang/six/Makefile
-
+7 -20libs/libsearpc/Makefile
-
+5 -9libs/libzdb/Makefile
-
+11 -11libs/libzdb/patches/010-cross-compile-fixes.patch
-
+1 -1libs/libzdb/patches/020-filterh-use-host-built-version.patch
-
+10 -9net/seafile-ccnet/Makefile
-
+31 -0net/seafile-ccnet/patches/010-Makefile.patch
-
+0 -300net/seafile-ccnet/patches/010-libevent-include-path.patch
-
+16 -115net/seafile-seahub/Makefile
-
+28 -0net/seafile-seahub/patches/020-Makefile-fixes.patch
-
+40 -62net/seafile-server/Makefile
-
+10 -0net/seafile-server/files/seafile.conf
-
+133 -33net/seafile-server/files/seafile.init
-
+226 -0net/seafile-server/files/seahub.init
-
+66 -29net/seafile-server/patches/020-script-patches.patch
-
+4 -4net/seafile-server/patches/030-pidfiles-in-same-directory.patch
-
+31 -38net/seafile-server/patches/040-seafile-admin.patch
-
+0 -17net/seafile-server/patches/050-libevhtp-search-path-fix.patch
-
+43 -0net/seafile-server/patches/050-libseafile-makefile-fixes.patch
-
+0 -107net/seafile-server/patches/060-libevent2-include-path.patch
-
+39 -0net/seafile-server/patches/060-timestamps-as-int64.patch
+ 53
- 0
lang/chardet/Makefile
View File
| @ -0,0 +1,53 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=chardet | |||
| PKG_VERSION:=2.3.0 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=LGPL-2.1 | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/c/chardet/ | |||
| PKG_MD5SUM:=25274d664ccb5130adae08047416e1a8 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/chardet | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Universal encoding detector for Python 2 and 3 | |||
| URL:=https://github.com/chardet/chardet | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/chardet/description | |||
| Universal encoding detector for Python 2 and 3 | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/chardet/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_DIR) $(1)/usr/bin | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/chardetect \ | |||
| $(1)/usr/bin | |||
| # fix python exec path in scripts | |||
| sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/bin/chardetect | |||
| endef | |||
| $(eval $(call BuildPackage,chardet)) | |||
+ 48
- 0
lang/django-appconf/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-appconf | |||
| PKG_VERSION:=1.0.1 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-appconf/ | |||
| PKG_MD5SUM:=29c87a00f0d098b90f3ac6113ae6e52d | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-appconf | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=A helper class for handling configuration defaults of packaged apps gracefully. | |||
| URL:=http://django-appconf.readthedocs.org/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-appconf/description | |||
| A helper class for handling configuration defaults of packaged apps gracefully. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-appconf/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-appconf)) | |||
+ 49
- 0
lang/django-compressor/Makefile
View File
| @ -0,0 +1,49 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-compressor | |||
| PKG_VERSION:=2.0 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=django_compressor-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django_compressor/ | |||
| PKG_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/ | |||
| PKG_MD5SUM:=98254da44f1676d7b871ffeb14115175 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-compressor | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Compresses linked and inline JavaScript or CSS into single cached files. | |||
| URL:=http://django-compressor.readthedocs.org/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-compressor/description | |||
| Compresses linked and inline JavaScript or CSS into single cached files. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-compressor/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-compressor)) | |||
+ 48
- 0
lang/django-constance/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-constance | |||
| PKG_VERSION:=1.1.2 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-constance/ | |||
| PKG_MD5SUM:=00d58c8d6c8cd7e352d14854aba8d5aa | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-constance | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Django live settings with pluggable backends, including Redis. | |||
| URL:=https://github.com/jazzband/django-constance | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-constance/description | |||
| Django live settings with pluggable backends, including Redis. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-constance/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-constance)) | |||
+ 48
- 0
lang/django-jsonfield/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-jsonfield | |||
| PKG_VERSION:=0.9.19 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-jsonfield/ | |||
| PKG_MD5SUM:=6ccf381732f67272a9b8b29b44079df7 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-jsonfield | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=JSONField for django models | |||
| URL:=https://github.com/bradjasper/django-jsonfield | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-jsonfield/description | |||
| JSONField for django models | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-jsonfield/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-jsonfield)) | |||
+ 48
- 0
lang/django-picklefield/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-picklefield | |||
| PKG_VERSION:=0.3.2 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-picklefield/ | |||
| PKG_MD5SUM:=b2c17ca9e03704ce33890e6aefc7b2e5 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-picklefield | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Pickled object field for Django | |||
| URL:=http://github.com/gintas/django-picklefield/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-picklefield/description | |||
| Pickled object field for Django | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-picklefield/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-picklefield)) | |||
+ 49
- 0
lang/django-postoffice/Makefile
View File
| @ -0,0 +1,49 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-postoffice | |||
| PKG_VERSION:=2.0.7 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=django-post_office-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-post_office/ | |||
| PKG_BUILD_DIR:=$(BUILD_DIR)/django-post_office-$(PKG_VERSION)/ | |||
| PKG_MD5SUM:=9c2dfea47834c98193f7bc442500ec40 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-postoffice | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=A Django app to monitor and send mail asynchronously, complete with template support. | |||
| URL:=https://github.com/ui/django-postoffice | |||
| DEPENDS:=+python +django +django-jsonfield | |||
| endef | |||
| define Package/django-postoffice/description | |||
| A Django app to monitor and send mail asynchronously, complete with template support. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-postoffice/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-postoffice)) | |||
+ 49
- 0
lang/django-restframework/Makefile
View File
| @ -0,0 +1,49 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-restframework | |||
| PKG_VERSION:=3.3.3 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=djangorestframework-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/djangorestframework/ | |||
| PKG_BUILD_DIR:=$(BUILD_DIR)/djangorestframework-$(PKG_VERSION) | |||
| PKG_MD5SUM:=6f5ee9646e7fa87dad4385d3c7e7678d | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-restframework | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Web APIs for Django, made easy. | |||
| URL:=http://www.django-rest-framework.org/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-restframework/description | |||
| Web APIs for Django, made easy. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-restframework/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-restframework)) | |||
+ 48
- 0
lang/django-statici18n/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django-statici18n | |||
| PKG_VERSION:=1.1.5 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/django-statici18n/ | |||
| PKG_MD5SUM:=ad9941818f54428508fece4a463ea1cc | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django-statici18n | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=A Django app that provides helper for generating JavaScript catalog to static files. | |||
| URL:=http://django-statici18n.readthedocs.org/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/django-statici18n/description | |||
| A Django app that provides helper for generating JavaScript catalog to static files. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/django-statici18n/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,django-statici18n)) | |||
+ 65
- 0
lang/django/Makefile
View File
| @ -0,0 +1,65 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=django | |||
| PKG_VERSION:=1.8.12 | |||
| PKG_RELEASE=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE_PROTO:=git | |||
| PKG_SOURCE_URL:=https://github.com/django/django.git | |||
| PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) | |||
| PKG_SOURCE_VERSION:=c168aeba175dbb92c615460a360cb1ea978de5d3 | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/django | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| TITLE:=The web framework for perfectionists with deadlines. | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| URL:=https://www.djangoproject.com/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/django/description | |||
| The web framework for perfectionists with deadlines. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Build/InstallDev | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_DIR) $(1)/usr/bin | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/django-admin.py \ | |||
| $(1)/usr/bin | |||
| endef | |||
| define Package/django/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_DIR) $(1)/usr/bin | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/django-admin.py \ | |||
| $(1)/usr/bin | |||
| # fix python exec path | |||
| sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/bin/django-admin.py | |||
| endef | |||
| $(eval $(call BuildPackage,django)) | |||
+ 48
- 0
lang/et_xmlfile/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=et_xmlfile | |||
| PKG_VERSION:=1.0.1 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/e/et_xmlfile/ | |||
| PKG_MD5SUM:=f47940fd9d556375420b2e276476cfaf | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/et_xmlfile | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=An implementation of lxml.xmlfile for the standard library | |||
| URL:=https://bitbucket.org/openpyxl/et_xmlfile | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/et_xmlfile/description | |||
| An implementation of lxml.xmlfile for the standard library | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/et_xmlfile/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,et_xmlfile)) | |||
+ 48
- 0
lang/flup/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=flup | |||
| PKG_VERSION:=1.0.2 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/f/flup/ | |||
| PKG_MD5SUM:=24dad7edc5ada31dddd49456ee8d5254 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/flup | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Random assortment of WSGI servers | |||
| URL:=http://www.saddi.com/software/flup/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/flup/description | |||
| Random assortment of WSGI servers | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/flup/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,flup)) | |||
+ 53
- 0
lang/gunicorn/Makefile
View File
| @ -0,0 +1,53 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=gunicorn | |||
| PKG_VERSION:=19.4.5 | |||
| PKG_RELEASE=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/g/gunicorn/ | |||
| PKG_MD5SUM:=ce45c2dccba58784694dd77f23d9a677 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/gunicorn | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| TITLE:=WSGI HTTP Server for UNIX | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| URL:=http://gunicorn.org/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/gunicorn/description | |||
| WSGI HTTP Server for UNIX | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/gunicorn/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_DIR) $(1)/usr/bin | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gunicorn* \ | |||
| $(1)/usr/bin | |||
| # fix python exec path in scripts | |||
| $(SED) 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/bin/gunicorn* | |||
| endef | |||
| $(eval $(call BuildPackage,gunicorn)) | |||
+ 48
- 0
lang/jdcal/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=jdcal | |||
| PKG_VERSION:=1.2 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-3-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/j/jdcal/ | |||
| PKG_MD5SUM:=ab8d5ba300fd1eb01514f363d19b1eb9 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/jdcal | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Julian dates from proleptic Gregorian and Julian calendars. | |||
| URL:=http://github.com/phn/jdcal | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/jdcal/description | |||
| Julian dates from proleptic Gregorian and Julian calendars. | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/jdcal/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,jdcal)) | |||
+ 48
- 0
lang/openpyxl/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=openpyxl | |||
| PKG_VERSION:=2.4.0-a1 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/o/openpyxl/ | |||
| PKG_MD5SUM:=e5ca6d23ceccb15115d45cdf26e736fc | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/openpyxl | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=A Python library to read/write Excel 2010 xlsx/xlsm files | |||
| URL:=https://openpyxl.readthedocs.org/ | |||
| DEPENDS:=+python +django | |||
| endef | |||
| define Package/openpyxl/description | |||
| A Python library to read/write Excel 2010 xlsx/xlsm files | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/openpyxl/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,openpyxl)) | |||
+ 48
- 0
lang/python-dateutil/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=python-dateutil | |||
| PKG_VERSION:=2.5.2 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=BSD-2-Clause | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/p/python-dateutil/ | |||
| PKG_MD5SUM:=eafe168e8f404bf384514f5116eedbb6 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/python-dateutil | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Extensions to the standard Python datetime module | |||
| URL:=https://dateutil.readthedocs.org/ | |||
| DEPENDS:=+python +six | |||
| endef | |||
| define Package/python-dateutil/description | |||
| Extensions to the standard Python datetime module | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/python-dateutil/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,python-dateutil)) | |||
+ 48
- 0
lang/pytz/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=pytz | |||
| PKG_VERSION:=2016.3 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/p/pytz/ | |||
| PKG_MD5SUM:=abae92c3301b27bd8a9f56b14f52cb29 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/pytz | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=World timezone definitions, modern and historical | |||
| URL:=https://sourceforge.net/projects/pytz/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/pytz/description | |||
| World timezone definitions, modern and historical | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/pytz/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,pytz)) | |||
+ 57
- 0
lang/rcssmin/Makefile
View File
| @ -0,0 +1,57 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=rcssmin | |||
| PKG_VERSION:=1.0.6 | |||
| PKG_RELEASE=1 | |||
| PKG_LICENSE:=Apache-2.0 | |||
| PKG_SOURCE_PROTO:=git | |||
| PKG_SOURCE_URL:=https://github.com/ndparker/rcssmin.git | |||
| PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) | |||
| PKG_SOURCE_VERSION:=4764e3bc47ca8d44be3198892e73c51d8a0a9970 | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/rcssmin | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| TITLE:=Fast CSS minifier for Python | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| URL:=http://opensource.perlig.de/rcssmin/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/rcssmin/description | |||
| Fast CSS minifier for Python | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Build/InstallDev | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| define Package/rcssmin/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,rcssmin)) | |||
+ 3
- 3
lang/simplejson/Makefile
View File
+ 48
- 0
lang/six/Makefile
View File
| @ -0,0 +1,48 @@ | |||
| # | |||
| # Copyright (C) 2007-2016 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=six | |||
| PKG_VERSION:=1.10.0 | |||
| PKG_RELEASE:=1 | |||
| PKG_LICENSE:=MIT | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
| PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/six/ | |||
| PKG_MD5SUM:=34eed507548117b2ab523ab14b2f8b55 | |||
| PKG_BUILD_DEPENDS:=python python-setuptools | |||
| include $(INCLUDE_DIR)/package.mk | |||
| $(call include_mk, python-package.mk) | |||
| define Package/six | |||
| SUBMENU:=Python | |||
| SECTION:=lang | |||
| CATEGORY:=Languages | |||
| MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> | |||
| TITLE:=Python 2 and 3 compatibility utilities | |||
| URL:=http://pypi.python.org/pypi/six/ | |||
| DEPENDS:=+python | |||
| endef | |||
| define Package/six/description | |||
| Python 2 and 3 compatibility utilities | |||
| endef | |||
| define Build/Compile | |||
| $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) | |||
| endef | |||
| define Package/six/install | |||
| $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) | |||
| $(CP) \ | |||
| $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ | |||
| $(1)$(PYTHON_PKG_DIR) | |||
| endef | |||
| $(eval $(call BuildPackage,six)) | |||
+ 7
- 20
libs/libsearpc/Makefile
View File
+ 5
- 9
libs/libzdb/Makefile
View File
+ 11
- 11
libs/libzdb/patches/010-cross-compile-fixes.patch
View File
+ 1
- 1
libs/libzdb/patches/020-filterh-use-host-built-version.patch
View File
+ 10
- 9
net/seafile-ccnet/Makefile
View File
+ 31
- 0
net/seafile-ccnet/patches/010-Makefile.patch
View File
| @ -0,0 +1,31 @@ | |||
| diff -rupN seafile-ccnet-5.1.1.orig/lib/Makefile.am seafile-ccnet-5.1.1/lib/Makefile.am | |||
| --- seafile-ccnet-5.1.1.orig/lib/Makefile.am 2016-04-21 11:04:46.000000000 +0200 | |||
| +++ seafile-ccnet-5.1.1/lib/Makefile.am 2016-04-22 10:02:52.583732050 +0200 | |||
| @@ -1,3 +1,4 @@ | |||
| +include $(TOPDIR)/rules.mk | |||
| AM_CPPFLAGS = @GLIB2_CFLAGS@ -I$(top_srcdir)/include \ | |||
| -I$(top_srcdir)/include/ccnet \ | |||
| @@ -72,11 +73,11 @@ ccnet-client.c: ccnet-object.h | |||
| ccnet-object.h: ${ccnet_object_define} | |||
| rm -f $@ | |||
| - valac --pkg posix ${ccnet_object_define} -C -H ccnet-object.h | |||
| + "$(STAGING_DIR_HOST)/bin/valac" --pkg posix ${ccnet_object_define} -C -H ccnet-object.h | |||
| ccnetobj.c: ${ccnet_object_define} | |||
| rm -f $@ | |||
| - valac -C --pkg posix ${ccnet_object_define} | |||
| + "$(STAGING_DIR_HOST)/bin/valac" -C --pkg posix ${ccnet_object_define} | |||
| searpc_gen = searpc-signature.h searpc-marshal.h | |||
| @@ -86,7 +87,7 @@ rpc_table.stamp: ${top_srcdir}/lib/rpc_t | |||
| @rm -f rpc_table.tmp | |||
| @touch rpc_table.tmp | |||
| @echo "[libsearpc]: generating rpc header files" | |||
| - @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py | |||
| + @PYTHON@ "$(STAGING_DIR)/usr/bin/searpc-codegen.py" ${top_srcdir}/lib/rpc_table.py | |||
| @echo "[libsearpc]: done" | |||
| @mv -f rpc_table.tmp $@ | |||
+ 0
- 300
net/seafile-ccnet/patches/010-libevent-include-path.patch
View File
| @ -1,300 +0,0 @@ | |||
| diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h | |||
| --- seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h 2015-09-09 19:22:23.515461892 +0200 | |||
| @@ -10,11 +10,7 @@ | |||
| #include <glib.h> | |||
| #include <glib-object.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #include "ccnet-session-base.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h seafile-ccnet-4.1.2/include/ccnet/cevent.h | |||
| --- seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/include/ccnet/cevent.h 2015-09-09 19:22:23.516461920 +0200 | |||
| @@ -6,13 +6,9 @@ | |||
| #ifndef CEVENT_H | |||
| #define CEVENT_H | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/event_compat.h> | |||
| #include <event2/event_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <glib.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/job-mgr.c seafile-ccnet-4.1.2/lib/job-mgr.c | |||
| --- seafile-ccnet-4.1.2.orig/lib/job-mgr.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/job-mgr.c 2015-09-09 19:22:23.516461920 +0200 | |||
| @@ -1,11 +1,7 @@ | |||
| /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/event_compat.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <string.h> | |||
| #include <stdlib.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h seafile-ccnet-4.1.2/lib/libccnet_utils.h | |||
| --- seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/libccnet_utils.h 2015-09-09 19:22:23.517461948 +0200 | |||
| @@ -15,11 +15,7 @@ | |||
| #include <glib-object.h> | |||
| #include <stdlib.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #ifdef WIN32 | |||
| #include <errno.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/mainloop.c seafile-ccnet-4.1.2/lib/mainloop.c | |||
| --- seafile-ccnet-4.1.2.orig/lib/mainloop.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/mainloop.c 2015-09-09 19:22:23.517461948 +0200 | |||
| @@ -3,13 +3,9 @@ | |||
| #include "include.h" | |||
| #include <ccnet.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/event_compat.h> | |||
| #include <event2/event_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| static int | |||
| cmdrsp_cb (const char *code, char *content, int clen, void *data) | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/net.h seafile-ccnet-4.1.2/lib/net.h | |||
| --- seafile-ccnet-4.1.2.orig/lib/net.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/net.h 2015-09-09 19:22:23.517461948 +0200 | |||
| @@ -19,11 +19,7 @@ | |||
| #include <netinet/tcp.h> | |||
| #endif | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #ifdef WIN32 | |||
| #define ECONNREFUSED WSAECONNREFUSED | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/packet-io.h seafile-ccnet-4.1.2/lib/packet-io.h | |||
| --- seafile-ccnet-4.1.2.orig/lib/packet-io.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/packet-io.h 2015-09-09 19:22:23.518461976 +0200 | |||
| @@ -5,11 +5,7 @@ | |||
| #include <packet.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| struct buffer; | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/processor.c seafile-ccnet-4.1.2/lib/processor.c | |||
| --- seafile-ccnet-4.1.2.orig/lib/processor.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/processor.c 2015-09-09 19:22:23.518461976 +0200 | |||
| @@ -4,11 +4,7 @@ | |||
| #include <pthread.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include "ccnet-client.h" | |||
| #include "processor.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/timer.c seafile-ccnet-4.1.2/lib/timer.c | |||
| --- seafile-ccnet-4.1.2.orig/lib/timer.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/timer.c 2015-09-09 19:22:23.519462004 +0200 | |||
| @@ -1,12 +1,8 @@ | |||
| /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/event_compat.h> | |||
| #include <event2/event_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <sys/time.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/lib/utils.h seafile-ccnet-4.1.2/lib/utils.h | |||
| --- seafile-ccnet-4.1.2.orig/lib/utils.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/lib/utils.h 2015-09-09 19:22:23.519462004 +0200 | |||
| @@ -11,11 +11,7 @@ | |||
| #include <glib-object.h> | |||
| #include <stdlib.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #ifdef WIN32 | |||
| #include <errno.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/cluster/server.c seafile-ccnet-4.1.2/net/cluster/server.c | |||
| --- seafile-ccnet-4.1.2.orig/net/cluster/server.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/cluster/server.c 2015-09-09 19:24:33.800125741 +0200 | |||
| @@ -6,11 +6,7 @@ | |||
| #include <stdio.h> | |||
| #include <getopt.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/dns.h> | |||
| -#else | |||
| -#include <evdns.h> | |||
| -#endif | |||
| #include "inner-session.h" | |||
| #include "outer-session.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h seafile-ccnet-4.1.2/net/common/connect-mgr.h | |||
| --- seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/common/connect-mgr.h 2015-09-09 19:22:23.520462032 +0200 | |||
| @@ -3,11 +3,7 @@ | |||
| #ifndef CCNET_CONNECTION_MANAGER | |||
| #define CCNET_CONNECTION_MANAGER | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include "timer.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.c seafile-ccnet-4.1.2/net/common/packet-io.c | |||
| --- seafile-ccnet-4.1.2.orig/net/common/packet-io.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/common/packet-io.c 2015-09-09 19:22:23.521462060 +0200 | |||
| @@ -13,13 +13,9 @@ | |||
| #include <unistd.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/bufferevent.h> | |||
| #include <event2/bufferevent_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <glib.h> | |||
| #include <errno.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.h seafile-ccnet-4.1.2/net/common/packet-io.h | |||
| --- seafile-ccnet-4.1.2.orig/net/common/packet-io.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/common/packet-io.h 2015-09-09 19:22:23.521462060 +0200 | |||
| @@ -5,13 +5,9 @@ | |||
| #include "packet.h" | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| #include <event2/buffer.h> | |||
| #include <event2/buffer_compat.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| /* struct evbuffer; */ | |||
| /* for libevent2 */ | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/common/peer.c seafile-ccnet-4.1.2/net/common/peer.c | |||
| --- seafile-ccnet-4.1.2.orig/net/common/peer.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/common/peer.c 2015-09-09 19:22:23.522462088 +0200 | |||
| @@ -2,14 +2,10 @@ | |||
| #include "common.h" | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/bufferevent.h> | |||
| #include <event2/bufferevent_compat.h> | |||
| #include <event2/bufferevent_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <stdio.h> | |||
| #include <stdlib.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/common/session.h seafile-ccnet-4.1.2/net/common/session.h | |||
| --- seafile-ccnet-4.1.2.orig/net/common/session.h 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/common/session.h 2015-09-09 19:22:23.523462116 +0200 | |||
| @@ -3,13 +3,9 @@ | |||
| #ifndef CCNET_SESSION_H | |||
| #define CCNET_SESSION_H | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/event_compat.h> | |||
| #include <event2/event_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <glib.h> | |||
| #include <glib/gstdio.h> | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/daemon/ccnet-daemon.c seafile-ccnet-4.1.2/net/daemon/ccnet-daemon.c | |||
| --- seafile-ccnet-4.1.2.orig/net/daemon/ccnet-daemon.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/daemon/ccnet-daemon.c 2015-09-09 19:24:59.313846178 +0200 | |||
| @@ -6,12 +6,8 @@ | |||
| #include <stdio.h> | |||
| #include <getopt.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/dns.h> | |||
| #include <event2/dns_compat.h> | |||
| -#else | |||
| -#include <evdns.h> | |||
| -#endif | |||
| #include "daemon-session.h" | |||
| #include "rpc-service.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/daemon/ccnet-test.c seafile-ccnet-4.1.2/net/daemon/ccnet-test.c | |||
| --- seafile-ccnet-4.1.2.orig/net/daemon/ccnet-test.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/daemon/ccnet-test.c 2015-09-09 19:24:45.089444412 +0200 | |||
| @@ -5,11 +5,7 @@ | |||
| #include <stdio.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/dns.h> | |||
| -#else | |||
| -#include <evdns.h> | |||
| -#endif | |||
| #include "utils.h" | |||
| diff -rupN seafile-ccnet-4.1.2.orig/net/server/ccnet-server.c seafile-ccnet-4.1.2/net/server/ccnet-server.c | |||
| --- seafile-ccnet-4.1.2.orig/net/server/ccnet-server.c 2015-09-09 18:49:35.000000000 +0200 | |||
| +++ seafile-ccnet-4.1.2/net/server/ccnet-server.c 2015-09-09 19:25:53.967392265 +0200 | |||
| @@ -6,11 +6,7 @@ | |||
| #include <stdio.h> | |||
| #include <getopt.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/dns.h> | |||
| -#else | |||
| -#include <evdns.h> | |||
| -#endif | |||
| #include "server-session.h" | |||
| #include "user-mgr.h" | |||
+ 16
- 115
net/seafile-seahub/Makefile
View File
+ 28
- 0
net/seafile-seahub/patches/020-Makefile-fixes.patch
View File
| @ -0,0 +1,28 @@ | |||
| diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile | |||
| --- seafile-seahub-5.1.1.orig/Makefile 2016-04-26 23:59:48.000000000 +0200 | |||
| +++ seafile-seahub-5.1.1/Makefile 2016-04-28 09:03:35.507105416 +0200 | |||
| @@ -1,3 +1,6 @@ | |||
| +include $(TOPDIR)/rules.mk | |||
| +$(call include_mk, python-package.mk) | |||
| + | |||
| PROJECT=seahub | |||
| develop: setup-git | |||
| @@ -9,7 +12,7 @@ dist: locale uglify statici18n collectst | |||
| locale: | |||
| @echo "--> Compile locales" | |||
| - django-admin.py compilemessages | |||
| + $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages) | |||
| @echo "" | |||
| uglify: | |||
| @@ -19,7 +22,7 @@ uglify: | |||
| statici18n: | |||
| @echo "--> Generate JS locale files in static/scripts/i18n" | |||
| - python manage.py compilejsi18n | |||
| + $(call HostPython,,manage.py compilejsi18n) | |||
| collectstatic: | |||
| @echo "--> Collect django static files to media/assets" | |||
+ 40
- 62
net/seafile-server/Makefile
View File
+ 10
- 0
net/seafile-server/files/seafile.conf
View File
| @ -1,2 +1,12 @@ | |||
| # Start Seahub in fastcgi mode - 1 = enable, 0 = disable | |||
| SEAHUB_FASTCGI=0 | |||
| # Listen on the port specified below (defaults to 8000) | |||
| SEAHUB_PORT=8000 | |||
| # Method of serving requests (fastcgi mode only) - threaded or prefork | |||
| # Using threaded mode is recommended as it consumes less resources | |||
| SEAHUB_METHOD=threaded | |||
| # The maximum number of worker processes/threads (fastcgi mode only) | |||
| # General formula: (2 x $num_cores) + 1 | |||
| # To set the number of workers in WSGI mode (which is the default) | |||
| # please edit /usr/share/seafile/seafile-server/runtime/seahub.conf | |||
| SEAHUB_WORKERS=3 | |||
+ 133
- 33
net/seafile-server/files/seafile.init
View File
| @ -1,57 +1,157 @@ | |||
| #!/bin/sh /etc/rc.common | |||
| #!/bin/bash /etc/rc.common | |||
| START=99 | |||
| START=98 | |||
| APP=seafile | |||
| 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 | |||
| TOPDIR=/usr/share/seafile | |||
| default_ccnet_conf_dir=${TOPDIR}/ccnet | |||
| central_config_dir=${TOPDIR}/conf | |||
| seaf_controller=/usr/bin/seafile-controller | |||
| [ -f /etc/config/seafile ] && \ | |||
| . /etc/config/seafile | |||
| function validate_ccnet_conf_dir () { | |||
| if [[ ! -d ${default_ccnet_conf_dir} ]]; then | |||
| echo "Error: there is no ccnet config directory." | |||
| echo "Have you run \"/etc/init.d/seafile setup\"?" | |||
| echo "" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function validate_central_conf_dir () { | |||
| if [[ ! -d ${central_config_dir} ]]; then | |||
| echo "Error: there is no conf/ directory." | |||
| echo "Have you run \"/etc/init.d/seafile setup\"?" | |||
| echo "" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function read_seafile_data_dir () { | |||
| seafile_ini=${default_ccnet_conf_dir}/seafile.ini | |||
| if [[ ! -f ${seafile_ini} ]]; then | |||
| echo "Error: ${seafile_ini} not found." | |||
| exit 1 | |||
| fi | |||
| seafile_data_dir=$(cat "${seafile_ini}") | |||
| if [[ ! -d ${seafile_data_dir} ]]; then | |||
| echo "Your seafile server data directory \"${seafile_data_dir}\" is invalid or doesn't exits." | |||
| echo "Please check it first, or create this directory yourself." | |||
| echo "" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function test_config() { | |||
| if ! ${seaf_controller} --test \ | |||
| -c "${default_ccnet_conf_dir}" \ | |||
| -d "${seafile_data_dir}" \ | |||
| -F "${central_config_dir}" ; then | |||
| exit 1 | |||
| fi | |||
| } | |||
| function check_component_running() { | |||
| name=$1 | |||
| cmd=$2 | |||
| if pid=$(pgrep -f "$cmd" 2>/dev/null); then | |||
| return 1 | |||
| fi | |||
| } | |||
| export PATH="/usr/share/seafile/seafile-server/seahub/thirdpart:${PATH}" | |||
| export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:${PYTHONPATH}" | |||
| function validate_already_running () { | |||
| check_component_running "seafile-controller" "seafile-controller -F ${central_config_dir}" || return 1 | |||
| check_component_running "ccnet-server" "ccnet-server -F ${central_config_dir}" || return 1 | |||
| check_component_running "seaf-server" "seaf-server -F ${central_config_dir}" || return 1 | |||
| check_component_running "fileserver" "fileserver -F ${central_config_dir}" || return 1 | |||
| check_component_running "seafdav" "wsgidav.server.run_server" || return 1 | |||
| } | |||
| function start_seafile_server () { | |||
| if ! validate_already_running; then | |||
| if [[ "$name" == "seafile-controller" ]]; then | |||
| echo "Seafile already running." | |||
| else | |||
| echo "Error: component [$name] is already running. Please try stopping it manually by running \"kill $pid\"." | |||
| echo "To force killing the process, use \"kill -9 $pid\"." | |||
| fi | |||
| exit 1 | |||
| fi | |||
| validate_central_conf_dir | |||
| validate_ccnet_conf_dir | |||
| read_seafile_data_dir | |||
| test_config | |||
| echo "Starting seafile server, please wait ..." | |||
| start() { | |||
| if [ ! -d /var/run/seafile ] | |||
| then | |||
| mkdir /var/run/seafile | |||
| chown seafile:seafile /var/run/seafile | |||
| chmod o-rwx /var/run/seafile | |||
| ${seaf_controller} \ | |||
| -F "${central_config_dir}" \ | |||
| -c "${default_ccnet_conf_dir}" \ | |||
| -d "${seafile_data_dir}" | |||
| sleep 3 | |||
| # check if seafile server started successfully | |||
| if ! pgrep -f "seafile-controller -F ${central_config_dir}" 2>/dev/null 1>&2; then | |||
| echo "Failed to start seafile server" | |||
| exit 1 | |||
| fi | |||
| if [ ${SEAHUB_FASTCGI} -eq 1 ]; then | |||
| cd "/usr/share/seafile" && \ | |||
| sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \ | |||
| "/usr/bin/seafile-admin" start --fastcgi | |||
| echo "Seafile server started" | |||
| echo | |||
| } | |||
| function stop_seafile_server () { | |||
| if ! pgrep -f "seafile-controller -F ${central_config_dir}" 2>/dev/null 1>&2; then | |||
| echo "Seafile server not running" | |||
| else | |||
| cd "/usr/share/seafile" && \ | |||
| sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \ | |||
| "/usr/bin/seafile-admin" start | |||
| echo "Stopping seafile server ..." | |||
| pkill -SIGTERM -f "seafile-controller -F ${central_config_dir}" | |||
| pkill -f "ccnet-server -F ${central_config_dir}" | |||
| pkill -f "seaf-server -F ${central_config_dir}" | |||
| pkill -f "fileserver -F ${central_config_dir}" | |||
| pkill -f "soffice.*--invisible --nocrashreport" | |||
| pkill -f "wsgidav.server.run_server" | |||
| retry=1 | |||
| while ! validate_already_running && [ $retry -lt 60 ]; do sleep 1; ((retry++)); done | |||
| if ! validate_already_running; then | |||
| echo "Error: [$name] component is still running. Please try stopping it manually by running \"kill $pid\"." | |||
| echo "To force killing the process, use \"kill -9 $pid\"." | |||
| fi | |||
| fi | |||
| } | |||
| stop() { | |||
| cd "/usr/share/seafile" && \ | |||
| sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \ | |||
| "/usr/bin/seafile-admin" stop | |||
| function restart_seafile_server () { | |||
| stop_seafile_server | |||
| start_seafile_server | |||
| } | |||
| function start() { | |||
| start_seafile_server | |||
| } | |||
| function stop() { | |||
| stop_seafile_server | |||
| } | |||
| function restart() { | |||
| restart_seafile_server | |||
| } | |||
| setup() { | |||
| cd "/usr/share/seafile" && \ | |||
| sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \ | |||
| "/usr/bin/seafile-admin" setup | |||
| function setup() { | |||
| cd "$TOPDIR" && \ | |||
| /usr/bin/seafile-admin setup | |||
| } | |||
| create_admin() { | |||
| cd "/usr/share/seafile" && \ | |||
| sudo PYTHONPATH="${PYTHONPATH}" -u seafile -E \ | |||
| "/usr/bin/seafile-admin" create-admin | |||
| function create_admin() { | |||
| cd "$TOPDIR" && \ | |||
| /usr/bin/seafile-admin create-admin | |||
| } | |||
| reset_admin() { | |||
| function reset_admin() { | |||
| create_admin | |||
| } | |||
+ 226
- 0
net/seafile-server/files/seahub.init
View File
| @ -0,0 +1,226 @@ | |||
| #!/bin/bash /etc/rc.common | |||
| START=99 | |||
| APP=seahub | |||
| EXTRA_HELP=" clearsessions Clears expired sessions from database" | |||
| EXTRA_COMMANDS="clearsessions" | |||
| SEAHUB_FASTCGI=0 | |||
| SEAHUB_PORT=8000 | |||
| SEAHUB_METHOD=threaded | |||
| SEAHUB_WORKERS=3 | |||
| [ -f /etc/config/seafile ] && \ | |||
| . /etc/config/seafile | |||
| INSTALLPATH=/usr/share/seafile/seafile-server | |||
| TOPDIR=$(dirname "${INSTALLPATH}") | |||
| default_ccnet_conf_dir=${TOPDIR}/ccnet | |||
| central_config_dir=${TOPDIR}/conf | |||
| manage_py=${INSTALLPATH}/seahub/manage.py | |||
| gunicorn_conf=${INSTALLPATH}/runtime/seahub.conf | |||
| pidfile=/var/run/seafile/seahub.pid | |||
| errorlog=${INSTALLPATH}/runtime/error.log | |||
| accesslog=${INSTALLPATH}/runtime/access.log | |||
| gunicorn_exe=/usr/bin/gunicorn | |||
| function check_python_executable() { | |||
| if [[ "$PYTHON" != "" && -x $PYTHON ]]; then | |||
| return 0 | |||
| fi | |||
| if which python2.7 2>/dev/null 1>&2; then | |||
| PYTHON=python2.7 | |||
| elif which python27 2>/dev/null 1>&2; then | |||
| PYTHON=python27 | |||
| else | |||
| echo | |||
| echo "Can't find a python executable of version 2.7 or above in PATH" | |||
| echo "Install python 2.7+ before continue." | |||
| echo "Or if you installed it in a non-standard PATH, set the PYTHON enviroment varirable to it" | |||
| echo | |||
| exit 1 | |||
| fi | |||
| } | |||
| function validate_ccnet_conf_dir() { | |||
| if [[ ! -d ${default_ccnet_conf_dir} ]]; then | |||
| echo "Error: there is no ccnet config directory." | |||
| echo "Have you run '/etc/init.d/seafile setup'?" | |||
| echo "" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function read_seafile_data_dir() { | |||
| seafile_ini=${default_ccnet_conf_dir}/seafile.ini | |||
| if [[ ! -f ${seafile_ini} ]]; then | |||
| echo "Error: ${seafile_ini} not found." | |||
| exit 1 | |||
| fi | |||
| seafile_data_dir=$(cat "${seafile_ini}") | |||
| if [[ ! -d ${seafile_data_dir} ]]; then | |||
| echo "Your seafile server data directory \"${seafile_data_dir}\" is invalid or doesn't exits." | |||
| echo "Please check it first, or create this directory yourself." | |||
| echo "" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function validate_seahub_running() { | |||
| if pid=$(pgrep -f "${manage_py}" 2>/dev/null); then | |||
| return 1 | |||
| elif pid=$(pgrep -f "seahub.wsgi:application" 2>/dev/null); then | |||
| return 1 | |||
| fi | |||
| } | |||
| function validate_port() { | |||
| if ! [[ ${SEAHUB_PORT} =~ ^[1-9][0-9]{1,4}$ ]] ; then | |||
| printf "\033[033m${SEAHUB_PORT}\033[m is not a valid port number\n" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function warning_if_seafile_not_running() { | |||
| if ! pgrep -f "seafile-controller -F ${central_config_dir}" 2>/dev/null 1>&2; then | |||
| echo | |||
| echo "Error: seafile-controller not running. Have you run \"/etc/init.d/seafile start\"?" | |||
| echo | |||
| exit 1 | |||
| fi | |||
| } | |||
| function prepare_seahub_log_dir() { | |||
| logdir="${TOPDIR}/logs" | |||
| if ! [[ -d "${logsdir}" ]]; then | |||
| if ! mkdir -p "${logdir}"; then | |||
| echo "Error: failed to create log dir \"${logdir}\"" | |||
| exit 1 | |||
| fi | |||
| fi | |||
| export SEAHUB_LOG_DIR="${logdir}" | |||
| } | |||
| function before_start() { | |||
| prepare_env | |||
| warning_if_seafile_not_running | |||
| if ! validate_seahub_running; then | |||
| echo "Seahub is already running." | |||
| exit 1 | |||
| fi | |||
| prepare_seahub_log_dir | |||
| validate_port | |||
| } | |||
| function start_seahub() { | |||
| before_start | |||
| echo "Starting seahub at port ${SEAHUB_PORT} ..." | |||
| check_init_admin | |||
| $PYTHON $gunicorn_exe seahub.wsgi:application -c "${gunicorn_conf}" -b "0.0.0.0:${SEAHUB_PORT}" --preload | |||
| # Ensure seahub is started successfully | |||
| retry=1 | |||
| while ! validate_seahub_running && [[ ! -f "${pidfile}" ]] && [[ $retry -lt 120 ]]; do sleep 1; ((retry++)); done | |||
| if ! validate_seahub_running && [[ -f "${pidfile}" ]]; then | |||
| echo | |||
| echo "Seahub is started" | |||
| echo | |||
| else | |||
| printf "\033[33mError: Seahub failed to start.\033[m\n" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function start_seahub_fastcgi() { | |||
| before_start | |||
| # Returns 127.0.0.1 if SEAFILE_FASTCGI_HOST is unset or hasn't got any value, | |||
| # otherwise returns value of SEAFILE_FASTCGI_HOST environment variable | |||
| address=`(test -z "$SEAFILE_FASTCGI_HOST" && echo "127.0.0.1") || echo $SEAFILE_FASTCGI_HOST` | |||
| echo "Starting seahub (fastcgi) at ${address}:${SEAHUB_PORT} ..." | |||
| check_init_admin | |||
| $PYTHON "${manage_py}" runfcgi host=${address} port=${SEAHUB_PORT} pidfile=${pidfile} \ | |||
| outlog=${accesslog} errlog=${errorlog} maxchildren=${SEAHUB_WORKERS} method=${SEAHUB_METHOD} | |||
| # Ensure seahub is started successfully | |||
| retry=1 | |||
| while ! validate_seahub_running && [[ ! -f "${pidfile}" ]] && [[ $retry -lt 120 ]]; do sleep 1; ((retry++)); done | |||
| if ! validate_seahub_running && [[ -f "${pidfile}" ]]; then | |||
| echo | |||
| echo "Seahub is started" | |||
| echo | |||
| else | |||
| printf "\033[33mError: Seahub failed to start.\033[m\n" | |||
| exit 1 | |||
| fi | |||
| } | |||
| function prepare_env() { | |||
| check_python_executable | |||
| validate_ccnet_conf_dir | |||
| read_seafile_data_dir | |||
| export CCNET_CONF_DIR=${default_ccnet_conf_dir} | |||
| export SEAFILE_CONF_DIR=${seafile_data_dir} | |||
| export SEAFILE_CENTRAL_CONF_DIR=${central_config_dir} | |||
| export PYTHONPATH="${INSTALLPATH}/seahub:${INSTALLPATH}/seahub/thirdpart:${PYTHONPATH}" | |||
| } | |||
| function clear_sessions() { | |||
| prepare_env | |||
| echo "Start clear expired session records ..." | |||
| $PYTHON "${manage_py}" clearsessions | |||
| echo | |||
| echo "Done" | |||
| echo | |||
| } | |||
| function stop_seahub() { | |||
| if [[ -f ${pidfile} ]]; then | |||
| pid=$(cat "${pidfile}") | |||
| echo "Stopping seahub ..." | |||
| kill ${pid} | |||
| rm -f ${pidfile} | |||
| retry=1 | |||
| while ! validate_seahub_running && [ $retry -lt 60 ]; do sleep 1; ((retry++)); done | |||
| if ! validate_seahub_running; then | |||
| echo "Error: seahub cannot be stopped. Please try stopping it manually by running \"kill $(echo "$pid" | tr '\n' ' ')\"." | |||
| echo "To force killing the processes, use \"kill -9 $(echo "$pid" | tr '\n' ' ')\"." | |||
| fi | |||
| else | |||
| echo "Seahub is not running" | |||
| fi | |||
| } | |||
| function check_init_admin() { | |||
| check_init_admin_script=${INSTALLPATH}/check_init_admin.py | |||
| if ! $PYTHON $check_init_admin_script; then | |||
| exit 1 | |||
| fi | |||
| } | |||
| function start() { | |||
| if [ "$SEAHUB_FASTCGI" == "1" ]; then | |||
| start_seahub_fastcgi | |||
| else | |||
| start_seahub | |||
| fi | |||
| } | |||
| function stop() { | |||
| stop_seahub | |||
| } | |||
| function restart() { | |||
| stop | |||
| start | |||
| } | |||
| function clearsessions() { | |||
| clear_sessions | |||
| } | |||
+ 66
- 29
net/seafile-server/patches/020-script-patches.patch
View File
| @ -1,40 +1,77 @@ | |||
| diff -rupN seafile-3.1.7-server.orig/scripts/seaf-gc.sh seafile-3.1.7-server/scripts/seaf-gc.sh | |||
| --- seafile-3.1.7-server.orig/scripts/seaf-gc.sh 2014-10-16 05:30:04.000000000 +0200 | |||
| +++ seafile-3.1.7-server/scripts/seaf-gc.sh 2014-12-13 00:51:12.919136978 +0100 | |||
| @@ -6,11 +6,10 @@ SCRIPT=$(readlink -f "$0") | |||
| INSTALLPATH=$(dirname "${SCRIPT}") | |||
| diff -rupN seafile-server-5.1.1.orig/scripts/seaf-fsck.sh seafile-server-5.1.1/scripts/seaf-fsck.sh | |||
| --- seafile-server-5.1.1.orig/scripts/seaf-fsck.sh 2016-04-21 11:05:26.000000000 +0200 | |||
| +++ seafile-server-5.1.1/scripts/seaf-fsck.sh 2016-04-22 09:10:13.075581325 +0200 | |||
| @@ -7,7 +7,7 @@ INSTALLPATH=$(dirname "${SCRIPT}") | |||
| TOPDIR=$(dirname "${INSTALLPATH}") | |||
| default_ccnet_conf_dir=${TOPDIR}/ccnet | |||
| default_conf_dir=${TOPDIR}/conf | |||
| -seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck | |||
| +seaf_fsck=/usr/bin/seaf-fsck | |||
| export PATH=${INSTALLPATH}/seafile/bin:$PATH | |||
| export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} | |||
| diff -rupN seafile-server-5.1.1.orig/scripts/seaf-gc.sh seafile-server-5.1.1/scripts/seaf-gc.sh | |||
| --- seafile-server-5.1.1.orig/scripts/seaf-gc.sh 2016-04-21 11:05:26.000000000 +0200 | |||
| +++ seafile-server-5.1.1/scripts/seaf-gc.sh 2016-04-22 09:10:27.211581999 +0200 | |||
| @@ -7,7 +7,7 @@ INSTALLPATH=$(dirname "${SCRIPT}") | |||
| TOPDIR=$(dirname "${INSTALLPATH}") | |||
| default_ccnet_conf_dir=${TOPDIR}/ccnet | |||
| default_conf_dir=${TOPDIR}/conf | |||
| -seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc | |||
| +seaf_gc=/usr/bin/seafserv-gc | |||
| seaf_gc_opts="" | |||
| -export PATH=${INSTALLPATH}/seafile/bin:$PATH | |||
| -export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} | |||
| +export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH" | |||
| script_name=$0 | |||
| function usage () { | |||
| @@ -78,9 +77,7 @@ function run_seaf_gc () { | |||
| echo "Starting seafserv-gc, please wait ..." | |||
| - LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_gc} \ | |||
| - -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" \ | |||
| - ${seaf_gc_opts} | |||
| + ${seaf_gc} -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" ${seaf_gc_opts} | |||
| export PATH=${INSTALLPATH}/seafile/bin:$PATH | |||
| diff -rupN seafile-server-5.1.1.orig/scripts/setup-seafile-mysql.sh seafile-server-5.1.1/scripts/setup-seafile-mysql.sh | |||
| --- seafile-server-5.1.1.orig/scripts/setup-seafile-mysql.sh 2016-04-21 11:05:26.000000000 +0200 | |||
| +++ seafile-server-5.1.1/scripts/setup-seafile-mysql.sh 2016-04-22 09:11:50.083585953 +0200 | |||
| @@ -40,15 +40,10 @@ function check_python_executable() { | |||
| function check_python_module () { | |||
| module=$1 | |||
| name=$2 | |||
| - hint=$3 | |||
| printf " Checking python module: ${name} ... " | |||
| if ! $PYTHON -c "import ${module}" 2>/dev/null 1>&2; then | |||
| echo | |||
| printf "\033[33m ${name} \033[m is not installed, Please install it first.\n" | |||
| - if [[ "${hint}" != "" ]]; then | |||
| - printf "${hint}" | |||
| - echo | |||
| - fi | |||
| err_and_quit; | |||
| fi | |||
| echo -e "Done." | |||
| @@ -70,14 +65,10 @@ function check_python () { | |||
| if [[ $PYTHON == "python2.6" ]]; then | |||
| py26="2.6" | |||
| fi | |||
| - hint="\nOn Debian/Ubntu: apt-get install python-setuptools\nOn CentOS/RHEL: yum install python${py26}-distribute" | |||
| - check_python_module pkg_resources setuptools "${hint}" | |||
| - | |||
| - hint="\nOn Debian/Ubntu: apt-get install python-imaging\nOn CentOS/RHEL: yum install python${py26}-imaging" | |||
| - check_python_module PIL python-imaging "${hint}" | |||
| echo "seafserv-gc run done" | |||
| - hint='\nOn Debian/Ubuntu:\n\nsudo apt-get install python-mysqldb\n\nOn CentOS/RHEL:\n\nsudo yum install MySQL-python' | |||
| - check_python_module MySQLdb python-mysqldb "${hint}" | |||
| + check_python_module pkg_resources setuptools | |||
| + check_python_module PIL python-imaging | |||
| + check_python_module MySQLdb python-mysqldb | |||
| fi | |||
| echo | |||
| diff -rupN seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh seafile-3.1.7-server/scripts/setup-seafile-mysql.sh | |||
| --- seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh 2014-10-16 05:30:04.000000000 +0200 | |||
| +++ seafile-3.1.7-server/scripts/setup-seafile-mysql.sh 2014-12-13 00:51:49.242172631 +0100 | |||
| @@ -9,6 +9,8 @@ set -e | |||
| SCRIPT=$(readlink -f "$0") | |||
| INSTALLPATH=$(dirname "${SCRIPT}") | |||
| } | |||
| @@ -85,5 +76,6 @@ function check_python () { | |||
| check_python; | |||
| export PYTHON=$PYTHON | |||
| +export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH" | |||
| + | |||
| cd "$INSTALLPATH" | |||
| python_script=setup-seafile-mysql.py | |||
| exec $PYTHON "$python_script" | |||
| diff -rupN seafile-server-5.1.1.orig/scripts/sqlite2mysql.sh seafile-server-5.1.1/scripts/sqlite2mysql.sh | |||
| --- seafile-server-5.1.1.orig/scripts/sqlite2mysql.sh 2016-04-21 11:05:26.000000000 +0200 | |||
| +++ seafile-server-5.1.1/scripts/sqlite2mysql.sh 2016-04-22 09:02:22.047558854 +0200 | |||
| @@ -1,4 +1,4 @@ | |||
| -#!/bin/sh | |||
| +#!/bin/bash | |||
| # | |||
| # This shell script and corresponding sqlite2mysql.py are used to | |||
| # migrate Seafile data from SQLite to MySQL. | |||
+ 4
- 4
net/seafile-server/patches/030-pidfiles-in-same-directory.patch
View File
+ 31
- 38
net/seafile-server/patches/040-seafile-admin.patch
View File
+ 0
- 17
net/seafile-server/patches/050-libevhtp-search-path-fix.patch
View File
| @ -1,17 +0,0 @@ | |||
| diff -rupN seafile-server-4.1.2.orig/server/Makefile.am seafile-server-4.1.2/server/Makefile.am | |||
| --- seafile-server-4.1.2.orig/server/Makefile.am 2015-05-02 11:04:11.000000000 +0200 | |||
| +++ seafile-server-4.1.2/server/Makefile.am 2015-06-14 01:28:55.924834806 +0200 | |||
| @@ -4,6 +4,7 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir) | |||
| -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ | |||
| -DSEAFILE_SERVER \ | |||
| -DFULL_FEATURE \ | |||
| + -I$(STAGING_DIR)/usr/include/libevhtp-1.1 \ | |||
| -I$(top_srcdir)/include \ | |||
| -I$(top_srcdir)/lib \ | |||
| -I$(top_builddir)/lib \ | |||
| @@ -122,4 +123,4 @@ seaf_server_LDADD = @CCNET_LIBS@ \ | |||
| @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \ | |||
| @LIBARCHIVE_LIBS@ | |||
| -seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ | |||
| +seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -L$(STAGING_DIR)/usr/lib/libevhtp-1.1 | |||
+ 43
- 0
net/seafile-server/patches/050-libseafile-makefile-fixes.patch
View File
| @ -0,0 +1,43 @@ | |||
| diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Makefile.am | |||
| --- seafile-server-5.1.1.orig/lib/Makefile.am 2016-04-21 11:05:26.000000000 +0200 | |||
| +++ seafile-server-5.1.1/lib/Makefile.am 2016-04-22 10:09:41.567751561 +0200 | |||
| @@ -1,3 +1,5 @@ | |||
| +include $(TOPDIR)/rules.mk | |||
| + | |||
| pcfiles = libseafile.pc | |||
| pkgconfig_DATA = $(pcfiles) | |||
| pkgconfigdir = $(libdir)/pkgconfig | |||
| @@ -35,7 +37,7 @@ seafile-rpc-wrapper.c: seafile-object.h | |||
| seafile-object.h: ${seafile_object_define} | |||
| rm -f $@ | |||
| - valac --pkg posix ${seafile_object_define} -C -H seafile-object.h | |||
| + "$(STAGING_DIR_HOST)/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h | |||
| DISTCLEANFILES = ${searpc_gen} | |||
| @@ -64,7 +66,7 @@ rpc_table.stamp: ${top_srcdir}/lib/rpc_t | |||
| @rm -f rpc_table.tmp | |||
| @touch rpc_table.tmp | |||
| @echo "[libsearpc]: generating rpc header files" | |||
| - @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py | |||
| + @PYTHON@ "$(STAGING_DIR)/usr/bin/searpc-codegen.py" ${top_srcdir}/lib/rpc_table.py | |||
| @echo "[libsearpc]: done" | |||
| @mv -f rpc_table.tmp $@ | |||
| @@ -74,7 +76,7 @@ vala.stamp: ${seafile_object_define} | |||
| rm -f ${seafile_object_gen} | |||
| @rm -f vala.tmp | |||
| @touch vala.tmp | |||
| - valac -C --pkg posix $^ | |||
| + "$(STAGING_DIR_HOST)/bin/valac" -C --pkg posix $^ | |||
| @mv -f vala.tmp $@ | |||
| ${seafile_object_gen}: vala.stamp | |||
| @@ -90,5 +92,5 @@ install-data-local: | |||
| if MACOS | |||
| sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) | |||
| else | |||
| - ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) | |||
| + ${SED} "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) | |||
| endif | |||
+ 0
- 107
net/seafile-server/patches/060-libevent2-include-path.patch
View File
| @ -1,107 +0,0 @@ | |||
| diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c | |||
| --- seafile-server-4.1.2.orig/lib/net.c 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/lib/net.c 2015-09-14 20:20:30.906021296 +0200 | |||
| @@ -31,11 +31,7 @@ | |||
| #include <fcntl.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #include "net.h" | |||
| diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h | |||
| --- seafile-server-4.1.2.orig/lib/net.h 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/lib/net.h 2015-09-14 20:20:30.906021296 +0200 | |||
| @@ -19,11 +19,7 @@ | |||
| #include <netinet/tcp.h> | |||
| #endif | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #ifdef WIN32 | |||
| #define ECONNREFUSED WSAECONNREFUSED | |||
| diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.h | |||
| --- seafile-server-4.1.2.orig/lib/utils.h 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/lib/utils.h 2015-09-14 20:20:30.907021326 +0200 | |||
| @@ -13,11 +13,7 @@ | |||
| #include <stdlib.h> | |||
| #include <sys/stat.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/util.h> | |||
| -#else | |||
| -#include <evutil.h> | |||
| -#endif | |||
| #ifdef __linux__ | |||
| #include <endian.h> | |||
| diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/server/access-file.c | |||
| --- seafile-server-4.1.2.orig/server/access-file.c 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/server/access-file.c 2015-09-14 20:20:30.907021326 +0200 | |||
| @@ -3,13 +3,9 @@ | |||
| #define DEBUG_FLAG SEAFILE_DEBUG_HTTP | |||
| #include "log.h" | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| #include <event2/bufferevent.h> | |||
| #include <event2/bufferevent_struct.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <evhtp.h> | |||
| diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/server/http-server.c | |||
| --- seafile-server-4.1.2.orig/server/http-server.c 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/server/http-server.c 2015-09-14 20:20:30.908021355 +0200 | |||
| @@ -6,11 +6,7 @@ | |||
| #include <locale.h> | |||
| #include <sys/types.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <evhtp.h> | |||
| diff -rupN seafile-server-4.1.2.orig/server/listen-mgr.c seafile-server-4.1.2/server/listen-mgr.c | |||
| --- seafile-server-4.1.2.orig/server/listen-mgr.c 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/server/listen-mgr.c 2015-09-14 20:23:15.614452334 +0200 | |||
| @@ -3,11 +3,9 @@ | |||
| #include <event2/event.h> | |||
| #include <event2/listener.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/bufferevent.h> | |||
| #include <event2/buffer_compat.h> | |||
| #include <event2/bufferevent_struct.h> | |||
| -#endif | |||
| #include "seafile-session.h" | |||
| diff -rupN seafile-server-4.1.2.orig/server/upload-file.c seafile-server-4.1.2/server/upload-file.c | |||
| --- seafile-server-4.1.2.orig/server/upload-file.c 2015-09-09 19:31:56.000000000 +0200 | |||
| +++ seafile-server-4.1.2/server/upload-file.c 2015-09-14 20:20:30.909021385 +0200 | |||
| @@ -6,11 +6,7 @@ | |||
| #include <getopt.h> | |||
| #include <fcntl.h> | |||
| -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||
| #include <event2/event.h> | |||
| -#else | |||
| -#include <event.h> | |||
| -#endif | |||
| #include <evhtp.h> | |||
+ 39
- 0
net/seafile-server/patches/060-timestamps-as-int64.patch
View File
| @ -0,0 +1,39 @@ | |||
| diff -rupN seafile-server-5.1.1.orig/lib/repo.vala seafile-server-5.1.1/lib/repo.vala | |||
| --- seafile-server-5.1.1.orig/lib/repo.vala 2016-04-19 15:44:32.000000000 +0200 | |||
| +++ seafile-server-5.1.1/lib/repo.vala 2016-04-25 21:29:33.327962235 +0200 | |||
| @@ -30,7 +30,7 @@ public class Repo : Object { | |||
| // data format version | |||
| public int version { get; set; } | |||
| - public int last_modify { get; set; } | |||
| + public int64 last_modify { get; set; } | |||
| public int64 size { get; set; } | |||
| public int64 file_count { get; set; } | |||
| public string head_cmmt_id { get; set; } | |||
| @@ -40,7 +40,7 @@ public class Repo : Object { | |||
| public string repo_id { get; set; } | |||
| public string repo_name { get; set; } | |||
| public string repo_desc { get; set; } | |||
| - public int last_modified { get; set; } | |||
| + public int64 last_modified { get; set; } | |||
| // Section 2: Encryption related | |||
| // Members in this section should be set for every Repo object | |||
| @@ -63,7 +63,7 @@ public class Repo : Object { | |||
| get { return _relay_id; } | |||
| set { _relay_id = value; } | |||
| } | |||
| - public int last_sync_time { get; set; } | |||
| + public int64 last_sync_time { get; set; } | |||
| public bool auto_sync { get; set; } | |||
| public bool worktree_invalid { get; set; } | |||
| @@ -155,7 +155,7 @@ public class DeletedEntry : Object { | |||
| public string obj_name { get; set; } | |||
| public string basedir { get; set; } | |||
| public int mode { get; set; } | |||
| - public int delete_time { get; set; } | |||
| + public int64 delete_time { get; set; } | |||
| public int64 file_size { get; set; } | |||
| public string scan_stat { get; set; } | |||
| } | |||