From 6e1cf0d3f393432aa71ca1c6924e10bb2794c8e2 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Tue, 20 Apr 2021 13:14:36 +0200 Subject: [PATCH 1/3] libsearpc: update to 3.2.0.20200318 Update to 3.2.0.20200318 (i.e. 3.2-latest). Remove patch to support python3. Add patch to support include of header file within extern "C". --- .../patches/001-python3-support.patch | 114 ------------------ .../patches/01-glib-include-kludge.patch | 26 ++++ srcpkgs/libsearpc/template | 13 +- 3 files changed, 34 insertions(+), 119 deletions(-) delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch deleted file mode 100644 index 7b4ae20c2819..000000000000 --- a/srcpkgs/libsearpc/patches/001-python3-support.patch +++ /dev/null @@ -1,114 +0,0 @@ -upstream: yes - -From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001 -From: Xiangyue Cai -Date: Mon, 8 Jun 2020 15:09:06 +0800 -Subject: [PATCH] configure with python3 (#53) - -* configure with python3 - -* remove future ---- - configure.ac | 2 +- - pysearpc/client.py | 1 - - pysearpc/named_pipe.py | 3 --- - pysearpc/pygencode.py | 3 --- - pysearpc/server.py | 2 -- - pysearpc/test_pysearpc.py | 1 - - pysearpc/transport.py | 2 -- - pysearpc/utils.py | 1 - - 8 files changed, 1 insertion(+), 14 deletions(-) - -diff --git configure.ac configure.ac -index 53d7438..9c2159a 100644 ---- configure.ac -+++ configure.ac -@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) - AC_SUBST(JANSSON_CFLAGS) - AC_SUBST(JANSSON_LIBS) - --AM_PATH_PYTHON([2.4]) -+AM_PATH_PYTHON([3.5]) - if test "$bwin32" = true; then - if test x$PYTHON_DIR != x; then - # set pyexecdir to somewhere like /c/Python26/Lib/site-packages -diff --git pysearpc/client.py pysearpc/client.py -index 20e5535..3650cb1 100644 ---- pysearpc/client.py -+++ pysearpc/client.py -@@ -1,4 +1,3 @@ --from builtins import object - import json - from .common import SearpcError - -diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py -index a0ca619..73df576 100644 ---- pysearpc/named_pipe.py -+++ pysearpc/named_pipe.py -@@ -2,9 +2,6 @@ - RPC client/server implementation based on named pipe transport. - """ - --from future import standard_library --standard_library.install_aliases() --from builtins import object - import json - import logging - import os -diff --git pysearpc/pygencode.py pysearpc/pygencode.py -index 62a635b..8c718ce 100644 ---- pysearpc/pygencode.py -+++ pysearpc/pygencode.py -@@ -1,8 +1,5 @@ - #!/usr/bin/python - -- --from __future__ import print_function --from builtins import str - import string - import sys - -diff --git pysearpc/server.py pysearpc/server.py -index a7ec7be..94d9bac 100644 ---- pysearpc/server.py -+++ pysearpc/server.py -@@ -1,5 +1,3 @@ --from builtins import str --from builtins import object - import json - - from .common import SearpcError -diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py -index a9c6f8b..64a455d 100755 ---- pysearpc/test_pysearpc.py -+++ pysearpc/test_pysearpc.py -@@ -1,7 +1,6 @@ - #!/usr/bin/env python - #coding: UTF-8 - --from builtins import object - import json - import logging - import os -diff --git pysearpc/transport.py pysearpc/transport.py -index 3c6e821..3deb42c 100644 ---- pysearpc/transport.py -+++ pysearpc/transport.py -@@ -1,5 +1,3 @@ -- --from builtins import object - class SearpcTransport(object): - """ - A transport is repsonsible to send the serialized request to the -diff --git pysearpc/utils.py pysearpc/utils.py -index 2aeda93..451ad4e 100644 ---- pysearpc/utils.py -+++ pysearpc/utils.py -@@ -1,4 +1,3 @@ --from builtins import bytes - import os - import socket - --- -2.30.0 - diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch new file mode 100644 index 000000000000..a08f97315c5d --- /dev/null +++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch @@ -0,0 +1,26 @@ + Seafile sources sometimes include searpc-client.h in an extern "C" block. + It then includes glib.h and glib-object.h, and recent versions of glib don't + work when included within extern "C". + + This is the easy fix: wrap the include of glib headers in extern "C++" to undo + the extern "C". + + Upstream is aware of the problem, and should have a fix soon, at which time this + kludge won't be needed anymore. +--- lib/searpc-client.h~ 2020-06-18 05:23:11.000000000 +0200 ++++ lib/searpc-client.h 2021-04-10 15:48:09.994005146 +0200 +@@ -7,8 +7,14 @@ + #define LIBSEARPC_API + #endif + ++#ifdef __cplusplus ++extern "C++" { ++#endif + #include + #include ++#ifdef __cplusplus ++} ++#endif + #include + + #ifndef DFT_DOMAIN diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 02273e1ef58d..22fbb7987d06 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,18 +1,21 @@ # Template file for 'libsearpc' # WARNING: upstream sometimes retag source. Wait for official announcement pkgname=libsearpc -version=3.2.0 -revision=4 +# 3.2-latest (as of 2021-04-10) +version=3.2.0.20200318 +revision=1 +_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90 +wrksrc="${pkgname}-${_gitrev}" build_style=gnu-configure -configure_args="PYTHON=python3 --disable-static --disable-compile-demo" +configure_args="--with-python3 --disable-static --disable-compile-demo" hostmakedepends="automake libtool pkg-config python3 glib-devel" makedepends="libglib-devel jansson-devel" 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/libsearpc/archive/v${version}.tar.gz" -checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff +distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz" +checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00 python_version=3 pre_configure() { From 6c34ad5ad88dfba9a04ba8487f83231d9a3f362a Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Tue, 20 Apr 2021 13:17:49 +0200 Subject: [PATCH 2/3] seafile-libclient: update to 8.0.1 --- srcpkgs/seafile-libclient/template | 6 +++--- srcpkgs/seafile-libclient/update | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/seafile-libclient/update diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index db394362f188..5a462985b88d 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,8 +1,8 @@ # Template file for 'seafile-libclient' # WARNING: upstream sometimes retag source. Wait for official announcement pkgname=seafile-libclient -version=7.0.10 -revision=2 +version=8.0.1 +revision=1 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="yopito " license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX homepage="https://seafile.com" distfiles="https://github.com/haiwen/seafile/archive/v${version}.tar.gz" -checksum=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45 +checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9 pre_configure() { ./autogen.sh diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update new file mode 100644 index 000000000000..a26f83a4fe01 --- /dev/null +++ b/srcpkgs/seafile-libclient/update @@ -0,0 +1,4 @@ +# upstream sometimes retag source +# use upstream's Ubuntu focal repo to detect new version. +site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-daemon/' +pattern='seafile-daemon_\K[\d.]+(?=_amd64.deb)' From a2473079c7c71a1437bfdb01795ec260c239f7f0 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Tue, 20 Apr 2021 13:19:17 +0200 Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.1 Remove libressl patch. Add depend for patched libsearpc-devel. --- srcpkgs/seafile-client-qt/patches/libressl.patch | 11 ----------- srcpkgs/seafile-client-qt/template | 6 +++--- srcpkgs/seafile-client-qt/update | 8 ++++---- 3 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch deleted file mode 100644 index 1774719fa34a..000000000000 --- a/srcpkgs/seafile-client-qt/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/utils/rsa.cpp.orig -+++ src/utils/rsa.cpp -@@ -13,7 +13,7 @@ - - /* Forward compatibility functions if libssl < 1.1.0. */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) - { diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index c0a475106e45..8d63b5259d52 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -1,20 +1,20 @@ # Template file for 'seafile-client-qt' pkgname=seafile-client-qt -version=7.0.10 +version=8.0.1 revision=1 _sourcename="seafile-client" wrksrc="${_sourcename}-${version}" build_style=cmake configure_args="$(vopt_if shibboleth '-DBUILD_SHIBBOLETH_SUPPORT=ON -DUSE_QT_WEBKIT=ON')" hostmakedepends="pkg-config" -makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel +makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel libsearpc-devel>=3.2.0.20200318 $(vopt_if shibboleth 'qt5-webkit-devel')" short_desc="Cloud storage system - Qt graphical client" maintainer="yopito " license="Apache-2.0" homepage="https://seafile.com" distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz" -checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333 +checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367 build_options="shibboleth" desc_option_shibboleth="Build with Shibboleth support" diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update index 8a583259f495..7c03301dc426 100644 --- a/srcpkgs/seafile-client-qt/update +++ b/srcpkgs/seafile-client-qt/update @@ -1,4 +1,4 @@ -# upstream sometimes retag source until official announcement. -# rely on windows client availabiliy to detect new version. -site=https://download.seadrive.org/ -pattern='seafile-\K[\d.]+(?=-en.msi)' +# upstream sometimes retag source +# use upstream's Ubuntu focal repo to detect new version. +site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-gui/' +pattern='seafile-gui_\K[\d.]+(?=_amd64.deb)'