summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--freefilesync/debian/changelog12
-rw-r--r--freefilesync/debian/freefilesync+devuan.dsc2
-rw-r--r--freefilesync/debian/patches/ffs_curl.patch30
-rw-r--r--freefilesync/ffs_curl.patch30
-rw-r--r--freefilesync/freefilesync.spec5
5 files changed, 47 insertions, 32 deletions
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 47308de..a64536c 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,15 @@
+freefilesync (11.11-1+devuan) obs; urgency=medium
+
+ * Upstream updates
+ - Fixed Shared Drive synchronization with Google Drive
+ - Directly open exported file list (.CSV) as temporary file
+ - Avoid EIO error for F_PREALLOCATE (macOS)
+ - Watch socket using "poll" instead of "select" (Linux, macOS)
+ - Fixed user-specific time/date format (Windows)
+ - Fixed system_profiler not found error (macOS)
+
+ -- B. Stack <bgstack15@gmail.com> Sat, 12 Jun 2021 11:54:19 -0400
+
freefilesync (11.10-1+devuan) obs; urgency=medium
* Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 2a21568..4148058 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: freefilesync
Binary: freefilesync
Architecture: any
-Version: 11.10-1+devuan
+Version: 11.11-1+devuan
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://freefilesync.org/
Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch
index 604ab30..0520d3a 100644
--- a/freefilesync/debian/patches/ffs_curl.patch
+++ b/freefilesync/debian/patches/ffs_curl.patch
@@ -1,10 +1,10 @@
-Source: AUR
-Author: Simon Brulhart, bgstack15
-Date: 2020-11-01 17:22:33 -0500
-Message:
-remove assertion for libcurl version >1.67 (1.66 should be safe but slower)
-The upstream release uses the curl git master branch instead of release versions. The AUR guy thinks it's acceptable to use the older version of libcurl, that is actually already released.
-Version: FreeFileSync 11.3
+Author: Brulhart, bgstack15
+Date: 2021-06-12 10:54:15 -0400
+Message: remove assertion for libcurl version >1.71
+Version: FreeFileSync 11.11
+Message: We have to omit checking for certain definitions.
+On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96
+On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97
diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp
--- 10.21-0/FreeFileSync/Source/afs/ftp.cpp 2020-03-18 08:56:08.608066350 -0400
+++ 10.21-1/FreeFileSync/Source/afs/ftp.cpp 2020-03-18 09:23:46.882110499 -0400
@@ -13,22 +13,22 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
}
- static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 67));
-+ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 68));
++ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 71 ));
/* 1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382
2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332
=> https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an
diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h
---- 11.3-0/libcurl/curl_wrap.h 2020-11-01 17:14:27.183497417 -0500
-+++ 11.3-1/libcurl/curl_wrap.h 2020-11-01 17:21:38.883967113 -0500
-@@ -137,10 +137,7 @@
+--- 11.11-0/libcurl/curl_wrap.h 2021-06-12 10:44:25.062468759 -0400
++++ 11.11-1/libcurl/curl_wrap.h 2021-06-12 10:50:24.350613680 -0400
+@@ -137,11 +137,8 @@
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
-- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
}
-- static_assert(CURL_LAST == CURLE_PROXY + 1);
+- static_assert(CURL_LAST == CURLE_SSL_CLIENTCERT + 1);
return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
}
-
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch
index 604ab30..0520d3a 100644
--- a/freefilesync/ffs_curl.patch
+++ b/freefilesync/ffs_curl.patch
@@ -1,10 +1,10 @@
-Source: AUR
-Author: Simon Brulhart, bgstack15
-Date: 2020-11-01 17:22:33 -0500
-Message:
-remove assertion for libcurl version >1.67 (1.66 should be safe but slower)
-The upstream release uses the curl git master branch instead of release versions. The AUR guy thinks it's acceptable to use the older version of libcurl, that is actually already released.
-Version: FreeFileSync 11.3
+Author: Brulhart, bgstack15
+Date: 2021-06-12 10:54:15 -0400
+Message: remove assertion for libcurl version >1.71
+Version: FreeFileSync 11.11
+Message: We have to omit checking for certain definitions.
+On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96
+On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97
diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp
--- 10.21-0/FreeFileSync/Source/afs/ftp.cpp 2020-03-18 08:56:08.608066350 -0400
+++ 10.21-1/FreeFileSync/Source/afs/ftp.cpp 2020-03-18 09:23:46.882110499 -0400
@@ -13,22 +13,22 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
}
- static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 67));
-+ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 68));
++ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 71 ));
/* 1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382
2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332
=> https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an
diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h
---- 11.3-0/libcurl/curl_wrap.h 2020-11-01 17:14:27.183497417 -0500
-+++ 11.3-1/libcurl/curl_wrap.h 2020-11-01 17:21:38.883967113 -0500
-@@ -137,10 +137,7 @@
+--- 11.11-0/libcurl/curl_wrap.h 2021-06-12 10:44:25.062468759 -0400
++++ 11.11-1/libcurl/curl_wrap.h 2021-06-12 10:50:24.350613680 -0400
+@@ -137,11 +137,8 @@
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
-- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
}
-- static_assert(CURL_LAST == CURLE_PROXY + 1);
+- static_assert(CURL_LAST == CURLE_SSL_CLIENTCERT + 1);
return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
}
-
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 6ef2bb3..b882410 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -19,7 +19,7 @@
%define libssh2_name libssh2-%{name}
%endif
Name: freefilesync
-Version: 11.10
+Version: 11.11
Release: 1%{?dist}
Summary: A file synchronization utility
@@ -210,6 +210,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
%changelog
+* Sat Jun 12 2021 B. Stack <bgstack15@gmail.com> - 11.11-1
+- version bump
+
* Mon May 10 2021 B. Stack <bgstack15@gmail.com> - 11.10-1
- version bump
bgstack15