diff --git a/c0a03e27e55253ccdded7fc4a3936c06428e5f5e.patch b/c0a03e27e55253ccdded7fc4a3936c06428e5f5e.patch deleted file mode 100644 index 2cbfa67..0000000 --- a/c0a03e27e55253ccdded7fc4a3936c06428e5f5e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c0a03e27e55253ccdded7fc4a3936c06428e5f5e Mon Sep 17 00:00:00 2001 -From: ly1217 -Date: Thu, 15 Nov 2018 21:58:16 -0800 -Subject: [PATCH] Fix the error that duplicate case value in switch. - ---- - daemon/http-tx-mgr.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/daemon/http-tx-mgr.c b/daemon/http-tx-mgr.c -index 80d418ab8..283e002b3 100644 ---- a/daemon/http-tx-mgr.c -+++ b/daemon/http-tx-mgr.c -@@ -1126,6 +1126,10 @@ handle_http_errors (HttpTxTask *task, int status) - static int - curl_error_to_http_task_error (int curl_error) - { -+ if (curl_error == CURLE_SSL_CACERT || -+ curl_error == CURLE_PEER_FAILED_VERIFICATION) -+ return HTTP_TASK_ERR_SSL; -+ - switch (curl_error) { - case CURLE_COULDNT_RESOLVE_PROXY: - return HTTP_TASK_ERR_RESOLVE_PROXY; -@@ -1136,9 +1140,7 @@ curl_error_to_http_task_error (int curl_error) - case CURLE_OPERATION_TIMEDOUT: - return HTTP_TASK_ERR_TX_TIMEOUT; - case CURLE_SSL_CONNECT_ERROR: -- case CURLE_PEER_FAILED_VERIFICATION: - case CURLE_SSL_CERTPROBLEM: -- case CURLE_SSL_CACERT: - case CURLE_SSL_CACERT_BADFILE: - case CURLE_SSL_ISSUER_ERROR: - return HTTP_TASK_ERR_SSL; diff --git a/seafile.spec b/seafile.spec index 4619bf0..e4fa69b 100644 --- a/seafile.spec +++ b/seafile.spec @@ -1,15 +1,13 @@ %global _hardened_build 1 Name: seafile -Version: 6.2.5 -Release: 2%{?dist} +Version: 6.2.11 +Release: 1%{?dist} Summary: Cloud storage cli client License: GPLv2 URL: http://seafile.com/ Source0: https://github.com/haiwen/%{name}/archive/v%{version}.tar.gz -# [PATCH] Fix the error that duplicate case value in switch. -Patch0: https://github.com/haiwen/seafile/commit/c0a03e27e55253ccdded7fc4a3936c06428e5f5e.patch BuildRequires: autoconf BuildRequires: automake @@ -53,7 +51,6 @@ developing applications that use %{name}. %prep %setup -q v%{version} -%patch0 -p1 sed -i -e /\(DESTDIR\)/d lib/libseafile.pc.in sed -i -e 's@#!/usr/bin/env python@#!/usr/bin/env python2@' app/seaf-cli @@ -94,6 +91,9 @@ find %{buildroot} -name 'seafile.desktop' -exec rm -f {} ';' %changelog +* Sat Feb 23 2019 Julien Enselme - 6.2.11-1 +- Update to 6.2.11 + * Sat Feb 02 2019 Fedora Release Engineering - 6.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild