summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-02-18 10:46:31 -0500
committerB Stack <bgstack15@gmail.com>2020-02-18 10:46:31 -0500
commit2335a7d9454a26978f042b7b4303c8e4cbf7987a (patch)
treea5aecb01558219c0d302312fd8bc4d4766d2d3e9
parentfix el7/el8 fix for fuzz in no_eraseif (diff)
downloadstackrpms-2335a7d9454a26978f042b7b4303c8e4cbf7987a.tar.gz
stackrpms-2335a7d9454a26978f042b7b4303c8e4cbf7987a.tar.bz2
stackrpms-2335a7d9454a26978f042b7b4303c8e4cbf7987a.zip
fix libssh2 patch for rpm to match it for dpkg
-rw-r--r--freefilesync/ffs_libssh2.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/freefilesync/ffs_libssh2.patch b/freefilesync/ffs_libssh2.patch
index 6ba7bea..66c6a88 100644
--- a/freefilesync/ffs_libssh2.patch
+++ b/freefilesync/ffs_libssh2.patch
@@ -22,3 +22,18 @@ Date: 2019-09-17T13:41:23Z
}
return replaceCpy<std::wstring>(L"SSH status %x.", L"%x", numberTo<std::wstring>(sc));
}
+Message: It appears upstream moved libssh2_wrap, but the above file patches correctly, so we will leave it while adding this new, identical patch.
+diff -Naur /usr/src/freefilesync/10.20-0/libssh2/libssh2_wrap.h /usr/src/freefilesync/10.20-1/libssh2/libssh2_wrap.h
+--- 10.20-0/libssh2/libssh2_wrap.h 2020-02-15 14:50:08.356617565 -0500
++++ 10.20-1/libssh2/libssh2_wrap.h 2020-02-15 15:11:25.992842154 -0500
+@@ -172,8 +172,8 @@
+ ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ENCRYPT);
+ ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_BAD_SOCKET);
+ ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KNOWN_HOSTS);
+- ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL);
+- ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED);
+ }
+ return replaceCpy<std::wstring>(L"SSH status %x.", L"%x", numberTo<std::wstring>(sc));
+ }
bgstack15