summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2024-06-23 17:53:15 -0400
committerB. Stack <bgstack15@gmail.com>2024-06-23 17:53:15 -0400
commit2c03041f46a3dd0b74cd7ddefa6a64acd1d5cec0 (patch)
tree1f5cde735a59ed0ba48115afaa03d8cdb808f016
parentj-m-p: try disabling version check (diff)
downloadstackrpms-2c03041f46a3dd0b74cd7ddefa6a64acd1d5cec0.tar.gz
stackrpms-2c03041f46a3dd0b74cd7ddefa6a64acd1d5cec0.tar.bz2
stackrpms-2c03041f46a3dd0b74cd7ddefa6a64acd1d5cec0.zip
ffs 13.7
-rw-r--r--freefilesync/debian/_service2
-rw-r--r--freefilesync/debian/changelog10
-rw-r--r--freefilesync/debian/freefilesync+stackrpms.dsc2
-rw-r--r--freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch13
4 files changed, 21 insertions, 6 deletions
diff --git a/freefilesync/debian/_service b/freefilesync/debian/_service
index 5c57a9b..f7081b7 100644
--- a/freefilesync/debian/_service
+++ b/freefilesync/debian/_service
@@ -14,7 +14,7 @@
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
- <param name="revision">13.6</param>
+ <param name="revision">13.7</param>
<param name="version">_none_</param>
</service>
<service name="recompress">
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 103c00d..b04123a 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,13 @@
+freefilesync (13.7-100+stackrpms) obs; urgency=low
+
+ * Upstream updates
+ * Support copying symlinks between SFTP devices
+ * Fixed input focus not being restored after comparison/sync
+ * Fixed log file pruning not considering selected configuration
+ * Show startup error details when running outside terminal (Linux)
+
+ -- B. Stack <bgstack15@gmail.com> Sun, 23 Jun 2024 17:52:53 -0400
+
freefilesync (13.6-100+stackrpms) obs; urgency=low
* Upstream updates
diff --git a/freefilesync/debian/freefilesync+stackrpms.dsc b/freefilesync/debian/freefilesync+stackrpms.dsc
index 1496570..27d6bd5 100644
--- a/freefilesync/debian/freefilesync+stackrpms.dsc
+++ b/freefilesync/debian/freefilesync+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: freefilesync
Binary: freefilesync
Architecture: any
-Version: 13.6-100+stackrpms
+Version: 13.7-100+stackrpms
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://freefilesync.org/
Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch
index c7ca90c..4e986af 100644
--- a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch
+++ b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch
@@ -22,7 +22,7 @@ Author: bgstack15
Author: Fab Stz <fabstz-it@yahoo.fr>
Origin: multiple sources
Forwarded: https://freefilesync.org/forum/viewtopic.php?t=9687
-Last-Update: 2024-02-05
+Last-Update: 2024-06-23
--- a/libcurl/curl_wrap.cpp
+++ b/libcurl/curl_wrap.cpp
@@ -67,7 +67,7 @@ Last-Update: 2024-02-05
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CACERT_BADFILE);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_NOT_FOUND);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSH);
-@@ -395,16 +411,46 @@ std::wstring zen::formatCurlStatusCode(C
+@@ -395,17 +411,51 @@ std::wstring zen::formatCurlStatusCode(C
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_INVALIDCERTSTATUS);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL);
@@ -92,10 +92,15 @@ Last-Update: 2024-02-05
+#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE);
+#endif
++#if LIBCURL_VERSION_NUM >= 0x080800 // 8.8.0
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_ECH_REQUIRED);
++#endif
ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
}
-+#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0
- static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);
++#if LIBCURL_VERSION_NUM >= 0x080800 // 8.8.0
+ static_assert(CURL_LAST == CURLE_ECH_REQUIRED + 1);
++#elif LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0
++ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);
+#elif LIBCURL_VERSION_NUM >= 0x075400 // 7.84.0
+ static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1);
+#elif LIBCURL_VERSION_NUM >= 0x074D00 // 7.77.0
bgstack15