From 8b845769486cced87d18c20d29009203b01c697e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Apr 2020 16:45:19 +0800 Subject: [PATCH 1/4] libsearpc: Update to "new" version, switch to git download method Upstream changed the v3.2.0 tag. Previously it referred to haiwen/libsearpc@23f581b39fa4555ede80efe2729f76e6159e8b7a; now it refers to haiwen/libsearpc@d1fd7518a20b25766ff98d6fde6e40c63626ca0d. This changes the packaged version to the "new" v3.2.0 and switches to using the git download method (technically the github_archive method), since the codeload filenames of the previous and current versions are the same but the files have different hashes. Signed-off-by: Jeffery To --- libs/libsearpc/Makefile | 11 +++++++---- .../patches/001-fix-memory-leak-GH-48.patch | 19 ------------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 libs/libsearpc/patches/001-fix-memory-leak-GH-48.patch diff --git a/libs/libsearpc/Makefile b/libs/libsearpc/Makefile index b2eba09a06..2183b8a471 100644 --- a/libs/libsearpc/Makefile +++ b/libs/libsearpc/Makefile @@ -9,17 +9,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsearpc PKG_VERSION:=3.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/haiwen/libsearpc/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=c479d85e405674c3450eac040abe143af5a9fafe7f1b74926e2a05280ab5420e +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/haiwen/libsearpc.git +PKG_SOURCE_VERSION:=d1fd7518a20b25766ff98d6fde6e40c63626ca0d +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) +PKG_MIRROR_HASH:=ee8b8b50b480afbcb71bd73cd9c2a96cfa72e9dafaf5773574adbf348e49a0d4 PKG_MAINTAINER:=Alexandru Ardelean , Jeffery To PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE.txt PKG_FIXUP:=autoreconf +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/libs/libsearpc/patches/001-fix-memory-leak-GH-48.patch b/libs/libsearpc/patches/001-fix-memory-leak-GH-48.patch deleted file mode 100644 index a0ae81fce8..0000000000 --- a/libs/libsearpc/patches/001-fix-memory-leak-GH-48.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 9b2e2dc65213fb22ed400dc54e4c2279564df62b Mon Sep 17 00:00:00 2001 -From: ly1217 -Date: Thu, 31 Oct 2019 00:31:38 -0700 -Subject: [PATCH] Fix memory leak. - ---- - lib/searpc-named-pipe-transport.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/lib/searpc-named-pipe-transport.c -+++ b/lib/searpc-named-pipe-transport.c -@@ -377,6 +377,7 @@ void searpc_free_client_with_pipe_transp - close(pipe_client->pipe_fd); - #endif - g_free (pipe_client); -+ g_free (data->service); - g_free (data); - searpc_client_free (client); - } From 239948b2618e4deb6ea7f626680e8c959c1d5993 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Apr 2020 22:53:08 +0800 Subject: [PATCH 2/4] seafile-ccnet: Update to 7.1.3 Signed-off-by: Jeffery To --- net/seafile-ccnet/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile index 6615f0efa2..0d76f01abf 100644 --- a/net/seafile-ccnet/Makefile +++ b/net/seafile-ccnet/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-ccnet -PKG_VERSION:=7.1.2 -PKG_RELEASE:=2 +PKG_VERSION:=7.1.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/haiwen/ccnet-server/tar.gz/v$(PKG_VERSION)-server? -PKG_HASH:=32d3d7290415497c52ab407a64468538662dde81ccd139b6e4499e3f2c5b8d4b +PKG_HASH:=148d9b1af9218943de310f3f2e29e542e7279dbfba307a1cdd894bf8b7faf2e8 PKG_MAINTAINER:=Alexandru Ardelean , Jeffery To PKG_LICENSE:=AGPL-3.0-only From 6138fe57fedc5ed8e4e33f564def85d229f66e9d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Apr 2020 23:37:15 +0800 Subject: [PATCH 3/4] seafile-seahub: Update to 7.1.3, refresh patches Signed-off-by: Jeffery To --- net/seafile-seahub/Makefile | 4 ++-- net/seafile-seahub/patches/030-uci-conf.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 47a6df7737..4e315ef846 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-seahub -PKG_VERSION:=7.1.2 +PKG_VERSION:=7.1.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server? -PKG_HASH:=647dca870c996ed00844d3bf45bc15f22fdf5268cfd3ac4c0dd9e4c15360361d +PKG_HASH:=a2cf1ad1ff357b06c112f3f80e2e4a2ef109813496c96afc309449f6915e8797 PKG_MAINTAINER:=Alexandru Ardelean , Jeffery To PKG_LICENSE:=Apache-2.0 diff --git a/net/seafile-seahub/patches/030-uci-conf.patch b/net/seafile-seahub/patches/030-uci-conf.patch index e5559e52d6..259c32b5c5 100644 --- a/net/seafile-seahub/patches/030-uci-conf.patch +++ b/net/seafile-seahub/patches/030-uci-conf.patch @@ -9,7 +9,7 @@ os.path.join(PROJECT_ROOT, 'seahub/templates'), ], 'APP_DIRS': True, -@@ -627,7 +627,7 @@ CAPTCHA_IMAGE_SIZE = (90, 42) +@@ -630,7 +630,7 @@ CAPTCHA_IMAGE_SIZE = (90, 42) ENABLE_THUMBNAIL = True # Absolute filesystem path to the directory that will hold thumbnail files. @@ -18,7 +18,7 @@ if os.path.exists(SEAHUB_DATA_ROOT): THUMBNAIL_ROOT = os.path.join(SEAHUB_DATA_ROOT, 'thumbnail') else: -@@ -790,7 +790,7 @@ except ImportError: +@@ -793,7 +793,7 @@ except ImportError: pass else: # In server release, sqlite3 db file is /seahub.db From 7328bcc15e823398773d337e1c2372610a9f6683 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Apr 2020 23:41:21 +0800 Subject: [PATCH 4/4] seafile-server: Update to 7.1.3 Signed-off-by: Jeffery To --- net/seafile-server/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile index d52d5ec6e5..d8c1901dac 100644 --- a/net/seafile-server/Makefile +++ b/net/seafile-server/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-server -PKG_VERSION:=7.1.2 -PKG_RELEASE:=2 +PKG_VERSION:=7.1.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seafile-server/tar.gz/v$(PKG_VERSION)-server? -PKG_HASH:=30b972d17eb13da28f4dffcbabd2a2a4a7426a017f694e0fb8440e93fd5bd355 +PKG_HASH:=79f7722a34c304adb78462194e64d6a610bd5ee40def37f4e4cdf5befed44fcd PKG_MAINTAINER:=Alexandru Ardelean , Jeffery To PKG_LICENSE:=AGPL-3.0-only