From 1fd295511606bbda4594619325ccaf8ce8438c26 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 3 Mar 2025 17:28:44 +0100 Subject: [PATCH] rebuilt [release 0.9.2-3mamba;Mon Mar 03 2025] --- ...oad.patch => curlftpfs-0.9.2-ioerror.patch | 7 ++++--- curlftpfs-0.9.2-no-verify-hostname.patch | 14 ++++++++++++++ curlftpfs.spec | 19 ++++++++++++------- 3 files changed, 30 insertions(+), 10 deletions(-) rename curlftpfs-0.9.2-file_upload.patch => curlftpfs-0.9.2-ioerror.patch (60%) create mode 100644 curlftpfs-0.9.2-no-verify-hostname.patch diff --git a/curlftpfs-0.9.2-file_upload.patch b/curlftpfs-0.9.2-ioerror.patch similarity index 60% rename from curlftpfs-0.9.2-file_upload.patch rename to curlftpfs-0.9.2-ioerror.patch index d298b45..6ca1afb 100644 --- a/curlftpfs-0.9.2-file_upload.patch +++ b/curlftpfs-0.9.2-ioerror.patch @@ -1,10 +1,11 @@ ---- ftpfs.c.orig 2008-04-30 01:05:47.000000000 +0200 -+++ ftpfs.c 2010-05-21 13:01:42.569006163 +0200 -@@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da +--- curlftpfs-0.9.2.orig/ftpfs.c 2008-04-30 03:05:47.000000000 +0400 ++++ curlftpfs-0.9.2.orig/ftpfs.c 2011-01-20 20:33:38.000000000 +0300 +@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); ++ curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1); curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/curlftpfs-0.9.2-no-verify-hostname.patch b/curlftpfs-0.9.2-no-verify-hostname.patch new file mode 100644 index 0000000..cf0d410 --- /dev/null +++ b/curlftpfs-0.9.2-no-verify-hostname.patch @@ -0,0 +1,14 @@ +diff -aur curlftpfs-0.9.2.orig/ftpfs.c curlftpfs-0.9.2.new/ftpfs.c +--- curlftpfs-0.9.2.orig/ftpfs.c 2016-01-25 17:01:32.150581272 +0100 ++++ curlftpfs-0.9.2.new/ftpfs.c 2016-01-25 17:02:08.566538053 +0100 +@@ -1625,9 +1625,7 @@ + } + + if (ftpfs.no_verify_hostname) { +- /* The default is 2 which verifies even the host string. This sets to 1 +- * which means verify the host but not the string. */ +- curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 1); ++ curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 0); + } + + curl_easy_setopt_or_die(easy, CURLOPT_INTERFACE, ftpfs.interface); diff --git a/curlftpfs.spec b/curlftpfs.spec index 4f4b249..ffcec9f 100644 --- a/curlftpfs.spec +++ b/curlftpfs.spec @@ -1,14 +1,15 @@ Name: curlftpfs Version: 0.9.2 -Release: 2mamba +Release: 3mamba Summary: A FTP filesystem based on cURL and FUSE Group: Applications/Networking Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino -URL: http://curlftpfs.sourceforge.net/ +Packager: Silvan Calarco +URL: https://curlftpfs.sourceforge.net/ Source: http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/%{version}/curlftpfs-%{version}.tar.gz -Patch: curlftpfs-0.9.2-file_upload.patch +Patch0: curlftpfs-0.9.2-ioerror.patch +Patch1: curlftpfs-0.9.2-no-verify-hostname.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -23,7 +24,8 @@ CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl. %prep %setup -q -%patch +%patch 0 -p1 -b .ioerror +%patch 1 -p1 -b .no-verify-hostname %build %configure @@ -39,10 +41,13 @@ CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl. %files %defattr(-,root,root) %{_bindir}/curlftpfs -%{_mandir}/man1/curlftpfs.1.gz -%doc COPYING ChangeLog README +%{_mandir}/man1/curlftpfs.1* +%doc COPYING %changelog +* Mon Mar 03 2025 Silvan Calarco 0.9.2-3mamba +- rebuilt + * Sat Sep 03 2022 Automatic Build System 0.9.2-2mamba - automatic rebuild by autodist