From a2b9e584ddac55a89db105c34b395880588c4d38 Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 1 Nov 2019 13:01:51 +0100 Subject: [PATCH 1/3] libsearpc: update to 3.2.0 --- srcpkgs/libsearpc/patches/python3.patch | 81 ------------------------- srcpkgs/libsearpc/template | 11 ++-- 2 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 srcpkgs/libsearpc/patches/python3.patch diff --git a/srcpkgs/libsearpc/patches/python3.patch b/srcpkgs/libsearpc/patches/python3.patch deleted file mode 100644 index 892abf75134..00000000000 --- a/srcpkgs/libsearpc/patches/python3.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- pysearpc/client.py.orig 2018-08-21 03:42:02.000000000 +0200 -+++ pysearpc/client.py 2018-10-03 18:10:31.097876808 +0200 -@@ -1,5 +1,5 @@ - import json --from common import SearpcError -+from .common import SearpcError - - def _fret_int(ret_str): - try: -@@ -7,10 +7,10 @@ - except: - raise SearpcError('Invalid response format') - -- if dicts.has_key('err_code'): -+ if 'err_code' in dicts: - raise SearpcError(dicts['err_msg']) - -- if dicts.has_key('ret'): -+ if 'ret' in dicts: - return dicts['ret'] - else: - raise SearpcError('Invalid response format') -@@ -21,10 +21,10 @@ - except: - raise SearpcError('Invalid response format') - -- if dicts.has_key('err_code'): -+ if 'err_code' in dicts: - raise SearpcError(dicts['err_msg']) - -- if dicts.has_key('ret'): -+ if 'ret' in dicts: - return dicts['ret'] - else: - raise SearpcError('Invalid response format') -@@ -61,7 +61,7 @@ - except: - raise SearpcError('Invalid response format') - -- if dicts.has_key('err_code'): -+ if 'err_code' in dicts: - raise SearpcError(dicts['err_msg']) - - if dicts['ret']: -@@ -75,7 +75,7 @@ - except: - raise SearpcError('Invalid response format') - -- if dicts.has_key('err_code'): -+ if 'err_code' in dicts: - raise SearpcError(dicts['err_msg']) - - l = [] ---- pysearpc/server.py.orig 2018-08-21 03:42:02.000000000 +0200 -+++ pysearpc/server.py 2018-10-03 18:10:31.097876808 +0200 -@@ -1,6 +1,6 @@ - import json - --from common import SearpcError -+from .common import SearpcError - - class SearpcService(object): - def __init__(self, name): -@@ -25,7 +25,7 @@ - """input str -> output str""" - try: - argv = json.loads(fcallstr) -- except Exception, e: -+ except Exception as e: - raise SearpcError('bad call str: ' + str(e)) - - service = self.services[svcname] -@@ -41,7 +41,7 @@ - def call_function(self, svcname, fcallstr): - try: - retVal = self._call_function(svcname, fcallstr) -- except Exception, e: -+ except Exception as e: - ret = {'err_code': 555, 'err_msg': str(e)} - else: - ret = {'ret': retVal} diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 61f68e5e7de..7bf4a639c72 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,7 +1,8 @@ # Template file for 'libsearpc' +# WARNING: upstream sometimes retag source. Wait for official announcement pkgname=libsearpc -version=3.1.0 -revision=2 +version=3.2.0 +revision=1 build_style=gnu-configure pycompile_module="pysearpc" configure_args="PYTHON=python3 --disable-static --disable-compile-demo" @@ -10,9 +11,9 @@ makedepends="libglib-devel jansson-devel" short_desc="Seafile RPC library" maintainer="yopito " license="LGPL-3.0-or-later, Apache-2.0" -homepage="https://github.com/haiwen/${pkgname}" -distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=cbd86d3c37b54ca2060ca537a07940fe3e98498abf345b2f3e1cec488230231a +homepage="https://seafile.com" +distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz" +checksum=c479d85e405674c3450eac040abe143af5a9fafe7f1b74926e2a05280ab5420e pre_configure() { ./autogen.sh From 7fce30188d206134cb099423c30b0c585fcaa85b Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 1 Nov 2019 13:01:53 +0100 Subject: [PATCH 2/3] seafile-libclient: update to 7.0.3 --- srcpkgs/libsearpc/template | 2 +- srcpkgs/seafile-libclient/template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 7bf4a639c72..db61c1f4f22 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -12,7 +12,7 @@ short_desc="Seafile RPC library" maintainer="yopito " license="LGPL-3.0-or-later, Apache-2.0" homepage="https://seafile.com" -distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz" checksum=c479d85e405674c3450eac040abe143af5a9fafe7f1b74926e2a05280ab5420e pre_configure() { diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index 5eda59c1041..63a75a682bf 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,8 @@ # Template file for 'seafile-libclient' +# WARNING: upstream sometimes retag source. Wait for official announcement pkgname=seafile-libclient -version=7.0.2 -revision=2 +version=7.0.3 +revision=1 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure @@ -12,9 +13,9 @@ makedepends="libglib-devel libuuid-devel libsearpc-devel sqlite-devel short_desc="Cloud storage system - library" maintainer="yopito " license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX -homepage="https://github.com/haiwen/seafile" -distfiles="${homepage}/archive/v${version}.tar.gz>${_distname}-${version}.tar.gz" -checksum=2424b303fa826321affad0f23341ac46ca085c895f3d6e1345e9b43dc13c2ab3 +homepage="https://seafile.com" +distfiles="https://github.com/haiwen/seafile/archive/v${version}.tar.gz" +checksum=8b4bea33023dc1ac64477b30a87c333b1e45f7f6e58341f7e9cde8f017f529f1 pre_configure() { ./autogen.sh From ae1155c10f2336208b8cdfb7eee3a0d75e381edb Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 1 Nov 2019 13:01:54 +0100 Subject: [PATCH 3/3] seafile-client-qt: update to 7.0.3 --- srcpkgs/seafile-client-qt/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index 573a81460fa..b9a29622b89 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -1,6 +1,7 @@ # Template file for 'seafile-client-qt' +# WARNING: upstream sometimes retag source. Wait for official announcement pkgname=seafile-client-qt -version=7.0.2 +version=7.0.3 revision=1 _sourcename="seafile-client" wrksrc="${_sourcename}-${version}" @@ -12,9 +13,9 @@ makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel short_desc="Cloud storage system - Qt graphical client" maintainer="yopito " license="Apache-2.0" -homepage="https://github.com/haiwen/${_sourcename}" -distfiles="https://github.com/haiwen/${_sourcename}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=338cc25dcb7307ac22c4dafc3d3434011368892752869ce6b7d281b991a6fca1 +homepage="https://seafile.com" +distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz" +checksum=2bf43708995ed051caabad9d2a9fede27b3833b940459f339a6b77fe3c88e099 build_options="shibboleth" desc_option_shibboleth="Build with Shibboleth support"