From 252442d2946daa207446a43a44921c7f3e3578ac Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Sun, 22 Oct 2017 23:43:09 +0200 Subject: [PATCH] seafile: upgrade to 6.2.2 Signed-off-by: Gergely Kiss --- libs/libsearpc/Makefile | 4 +-- net/seafile-ccnet/Makefile | 8 +++--- net/seafile-seahub/Makefile | 8 +++--- .../patches/020-Makefile-fixes.patch | 26 ++++++++++++++----- net/seafile-server/Makefile | 12 ++++----- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/libs/libsearpc/Makefile b/libs/libsearpc/Makefile index 4d641f44e..bf05c6d92 100644 --- a/libs/libsearpc/Makefile +++ b/libs/libsearpc/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsearpc -PKG_VERSION:=6.0.7 +PKG_VERSION:=6.2.2 PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_LICENSE:=GPL-3.0 @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://github.com/haiwen/libsearpc.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=8998e7b2c5587f0b94c48db24e2952d08def5add PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=125f40beb7d310e65571cb0d93f157b196e83423fde69bebf9880ca1cfac6c46 +PKG_MIRROR_HASH:=207baa1fc63a60c117cf4985b60a18212b151fa070f208621633c3b53ab679bf PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile index bffe65492..30def93ea 100644 --- a/net/seafile-ccnet/Makefile +++ b/net/seafile-ccnet/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-ccnet -PKG_VERSION:=6.0.7 +PKG_VERSION:=6.2.2 PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_LICENSE:=GPL-3.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/haiwen/ccnet-server.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=a0de32b9cfeca98ab93d84cacbe9d315d7ecca35 +PKG_SOURCE_VERSION:=6b9d7e2920aa9b807f9efe9038439b57ce949ecc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=b7ac0e5775aff91746e7bfc297b6cf788c9e7372084e28762467f8bd75cee2f8 +PKG_MIRROR_HASH:=8aed6d2283ac7b3148f9b5c82b1d992ed36dc5193000cf727bdcfae7446ce1fe PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -34,7 +34,7 @@ define Package/seafile-ccnet DEPENDS:=+libsearpc +libevent2 +libopenssl \ +glib2 +python +libzdb +libuuid \ +libpthread +libsqlite3 +jansson $(ICONV_DEPENDS) - EXTRA_DEPENDS:=libsearpc (=6.0.7-8998e7b2c5587f0b94c48db24e2952d08def5add-1) + EXTRA_DEPENDS:=libsearpc (=6.2.2-8998e7b2c5587f0b94c48db24e2952d08def5add-1) endef define Package/seafile-ccnet/description diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 32eebf5fa..332739cae 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-seahub -PKG_VERSION:=6.0.7 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-2 +PKG_VERSION:=6.2.2 +PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_LICENSE:=Apache-2.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/haiwen/seahub.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=2cf75b17a372216a88842172f769d61f621416fd +PKG_SOURCE_VERSION:=120e7a299e77968f1af48ea2dcf4bd9b909c426f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=69e90cff3bb63967bca1bd04c8e25ff6f89aa5dba595df29854115c3560d9804 +PKG_MIRROR_HASH:=511500c40dd7b1009f77109c6df810df1cf2c17a84a8f6841d592a9e05d22064 include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) diff --git a/net/seafile-seahub/patches/020-Makefile-fixes.patch b/net/seafile-seahub/patches/020-Makefile-fixes.patch index 49b67f8f1..c25f3d555 100644 --- a/net/seafile-seahub/patches/020-Makefile-fixes.patch +++ b/net/seafile-seahub/patches/020-Makefile-fixes.patch @@ -1,6 +1,6 @@ -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 +diff -rupN seafile-seahub-6.2.2.orig/Makefile seafile-seahub-6.2.2/Makefile +--- seafile-seahub-6.2.2.orig/Makefile 2017-10-22 22:28:22.000000000 +0200 ++++ seafile-seahub-6.2.2/Makefile 2017-10-22 22:46:18.007470936 +0200 @@ -1,3 +1,6 @@ +include $(TOPDIR)/rules.mk +$(call include_mk, python-package.mk) @@ -8,16 +8,18 @@ diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile PROJECT=seahub develop: setup-git -@@ -9,7 +12,7 @@ dist: locale uglify statici18n collectst +@@ -9,7 +12,9 @@ dist: locale uglify statici18n collectst locale: @echo "--> Compile locales" -- django-admin.py compilemessages +- django-admin.py compilemessages && cd seahub/two_factor && django-admin.py compilemessages ++ $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages) ++ cd seahub/two_factor + $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages) @echo "" uglify: -@@ -19,7 +22,7 @@ uglify: +@@ -19,17 +24,17 @@ uglify: statici18n: @echo "--> Generate JS locale files in static/scripts/i18n" @@ -26,3 +28,15 @@ diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile collectstatic: @echo "--> Collect django static files to media/assets" + rm -rf media/assets 2> /dev/null +- python manage.py collectstatic --noinput ++ $(call HostPython,,manage.py collectstatic --noinput) + + compressstatic: + @echo "--> Compress static files(css) to media/CACHE" + rm -rf media/CACHE 2> /dev/null +- python manage.py compress ++ $(call HostPython,,manage.py compress) + + clean: + @echo '--> Cleaning media/static cache & dist' diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile index 2fe020ea0..0a0506b38 100644 --- a/net/seafile-server/Makefile +++ b/net/seafile-server/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-server -PKG_VERSION:=6.0.7 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-3 +PKG_VERSION:=6.2.2 +PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_LICENSE:=GPL-3.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/haiwen/seafile-server.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=715f072c1bbc78eedddcaf7748e28c83c3f4dbc6 +PKG_SOURCE_VERSION:=6978d2cb2e05cc774370b4d06c9f0a864df71936 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=eaba9296a1fbc4429bacc6234e3e643da7b8f7950ba42c9b9b5b1d58c38c4273 +PKG_MIRROR_HASH:=99aa9c41641d7c0ffe18bbab75418b1347dd9e156124472bbee5a6dda09a8057 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -34,7 +34,7 @@ define Package/seafile-server DEPENDS:=+libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub +sqlite3-cli +python-mysql +python-urllib3 \ +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 +libmysqlclient \ +libpthread +libuuid +bash +procps-ng +procps-ng-pkill +SEAFILE_FUSE_SUPPORT:libfuse $(ICONV_DEPENDS) - EXTRA_DEPENDS:=seafile-ccnet (=6.0.7-a0de32b9cfeca98ab93d84cacbe9d315d7ecca35-1), seafile-seahub (=6.0.7-2cf75b17a372216a88842172f769d61f621416fd-2) + EXTRA_DEPENDS:=seafile-ccnet (=6.2.2-6b9d7e2920aa9b807f9efe9038439b57ce949ecc-1), seafile-seahub (=6.2.2-120e7a299e77968f1af48ea2dcf4bd9b909c426f-1) MENU:=1 endef @@ -93,7 +93,6 @@ define Package/seafile-server/install $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/seafile/ $(1)$(PYTHON_PKG_DIR)/ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/seaserv/ $(1)$(PYTHON_PKG_DIR)/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libseafile.so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/scripts/seaf-gc.sh $(1)/usr/share/seafile/seafile-server/ $(CP) $(PKG_BUILD_DIR)/scripts/seaf-fsck.sh $(1)/usr/share/seafile/seafile-server/ ifeq ($(CONFIG_SEAFILE_FUSE_SUPPORT),y) @@ -117,7 +116,6 @@ define Build/InstallDev $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(CP) $(PKG_INSTALL_DIR)/usr/include/seafile/ $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libseafile.pc $(1)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libseafile.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/seafile/ $(1)$(PYTHON_PKG_DIR)/ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/seaserv/ $(1)$(PYTHON_PKG_DIR)/ endef