From d057adcfc32bcd4bf1f7e6885f04a0c66a5fae7a Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 1 Nov 2019 13:01:51 +0100
Subject: [PATCH] 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 892abf7513..0000000000
--- 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 61f68e5e7d..7bf4a639c7 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 <pierre.bourgin@free.fr>"
 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