Hello community, here is the log from the commit of package libssh for openSUSE:Factory checked in at 2018-09-04 22:46:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libssh (Old) and /work/SRC/openSUSE:Factory/.libssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libssh" Tue Sep 4 22:46:40 2018 rev:48 rq:632446 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libssh/libssh.changes 2018-03-13 10:22:04.493991493 +0100 +++ /work/SRC/openSUSE:Factory/.libssh.new/libssh.changes 2018-09-04 22:46:42.819054377 +0200 @@ -1,0 +2,62 @@ +Thu Aug 30 06:00:24 UTC 2018 - Andreas Schneider <[email protected]> + +- Update to version 0.8.2 + * Added sha256 fingerprints for pubkeys + * Improved compiler flag detection + * Fixed race condition in reading sftp messages + * Fixed doxygen generation and added modern style + * Fixed library initialization on Windows + * Fixed __bounded__ attribute detection + * Fixed a bug in the options parser + * Fixed documentation for new knwon_hosts API +- Added patch: 0001-poll-Fix-size-types-in-ssh_event_free.patch + * Fix compiler warning on SLE12 + +------------------------------------------------------------------- +Mon Aug 27 09:25:49 UTC 2018 - [email protected] + +- Add missing zlib-devel dependency which was previously pulled in + by libopenssl-devel + +------------------------------------------------------------------- +Tue Aug 14 13:34:19 UTC 2018 - [email protected] + +- Remove the libssh_threads.so symlink + +------------------------------------------------------------------- +Mon Aug 13 20:26:03 UTC 2018 - [email protected] + +- Update to version 0.8.1 + * Fixed version number in the header + * Fixed version number in pkg-config and cmake config + * Fixed library initialization + * Fixed attribute detection + +------------------------------------------------------------------- +Fri Aug 10 12:01:17 UTC 2018 - [email protected] + +- Update to version 0.8.0 + * Removed support for deprecated SSHv1 protocol + * Added new connector API for clients + * Added new known_hosts parsing API + * Added support for OpenSSL 1.1 + * Added support for chacha20-poly1305 cipher + * Added crypto backend for mbedtls crypto library + * Added ECDSA support with gcrypt backend + * Added advanced client and server testing using cwrap.org + * Added support for curve25519-sha256 alias + * Added support for global known_hosts file + * Added support for symbol versioning + * Improved ssh_config parsing + * Improved threading support +- Removed 0001-libcrypto-Remove-AES_ctr128_encrypt.patch +- Removed 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch +- Removed 0001-libcrypto-Use-newer-API-for-HMAC.patch +- Removed 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch +- Removed 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch +- Removed 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch +- Removed 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch +- Removed 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch +- Removed 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch + +------------------------------------------------------------------- Old: ---- 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch 0001-libcrypto-Remove-AES_ctr128_encrypt.patch 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch 0001-libcrypto-Use-newer-API-for-HMAC.patch 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch libssh-0.7.5.tar.asc libssh-0.7.5.tar.xz New: ---- 0001-poll-Fix-size-types-in-ssh_event_free.patch libssh-0.8.2.tar.xz libssh-0.8.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh.spec ++++++ --- /var/tmp/diff_new_pack.fDvB7r/_old 2018-09-04 22:46:43.331056142 +0200 +++ /var/tmp/diff_new_pack.fDvB7r/_new 2018-09-04 22:46:43.339056170 +0200 @@ -16,31 +16,26 @@ # +%bcond_without docs + +%if 0%{?suse_version} < 1500 || 0%{?sle_version} < 150000 +# We need cmake >= 3.9 to build docs +%bcond_with docs +%endif + Name: libssh -Version: 0.7.5 +Version: 0.8.2 Release: 0 Summary: The SSH library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: https://www.libssh.org -# Dynamic number: https://red.libssh.org/projects/libssh/files -Source0: https://red.libssh.org/attachments/download/218/%{name}-%{version}.tar.xz -Source1: https://red.libssh.org/attachments/download/217/%{name}-%{version}.tar.asc -Source2: https://cryptomilk.org/[email protected]_key.asc#/%{name}.keyring +URL: https://www.libssh.org +Source0: https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz +Source1: https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz.asc +Source2: https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/%{name}.keyring Source99: baselibs.conf -# PATCH-FIX-UPSTREAM Upstream patches for OpenSSL 1.1 compatibility (will appear in 0.8 release) -Patch0: 0001-libcrypto-Remove-AES_ctr128_encrypt.patch -Patch1: 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch -Patch2: 0001-libcrypto-Use-newer-API-for-HMAC.patch -Patch3: 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch -Patch4: 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch -Patch5: 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch -Patch6: 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch -Patch7: 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch -# END of OpenSSL 1.1 support patches -# PATCH-FIX-UPSTREAM Fix parsing of config files (boo#1067782) -Patch10: 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch -Patch11: 0001-disable-timeout-test-on-slow-buildsystems.patch +Patch0: 0001-disable-timeout-test-on-slow-buildsystems.patch +Patch1: 0001-poll-Fix-size-types-in-ssh_event_free.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ @@ -49,7 +44,7 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: zlib-devel %description An SSH implementation in the form of a library. With libssh, you can @@ -84,25 +79,17 @@ %description devel Development headers for the SSH library. +%if %{with docs} %package devel-doc Summary: SSH library API documentation Group: Documentation/HTML %description devel-doc Documentation for libssh development. +%endif # with docs %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch10 -p1 -%patch11 -p1 +%autosetup -p1 %build @@ -114,52 +101,41 @@ %cmake \ -DCMAKE_C_FLAGS:STRING="%{optflags} -DOPENSSL_LOAD_CONF" \ - -DWITH_CLIENT_TESTING="OFF" \ - -DWITH_TESTING="ON" \ + -DUNIT_TESTING="ON" \ -DWITH_GSSAPI=ON \ - -DWITH_BENCHMARKS="OFF" \ -DWITH_EXAMPLES="OFF" \ -DSLOW_TEST_SYSTEM=%{slow_test_system} make %{?_smp_mflags} -make %{?_smp_mflags} doc +%if %{with docs} +make %{?_smp_mflags} docs +%endif # with docs %install %cmake_install -# remove the static libs, we don't want them installed, needed by tests -rm -rf %{buildroot}%{_libdir}/*.a - %check cd build -make %{?_smp_mflags} test || { - cat Testing/Temporary/LastTest.log; - exit 1; -} +ctest --output-on-failure %post -n libssh4 -p /sbin/ldconfig - %postun -n libssh4 -p /sbin/ldconfig %files -n libssh4 -%defattr(-,root,root) %doc AUTHORS README ChangeLog %{_libdir}/libssh.so.* -%{_libdir}/libssh_threads.so.* %files devel -%defattr(-,root,root) %{_includedir}/libssh %{_libdir}/libssh.so -%{_libdir}/libssh_threads.so %{_libdir}/pkgconfig/libssh.pc -%{_libdir}/pkgconfig/libssh_threads.pc %dir %{_libdir}/cmake/libssh %{_libdir}/cmake/libssh/libssh-config.cmake %{_libdir}/cmake/libssh/libssh-config-version.cmake +%if %{with docs} %files devel-doc -%defattr(-,root,root) %doc build/doc/html +%endif # with docs %changelog ++++++ 0001-disable-timeout-test-on-slow-buildsystems.patch ++++++ --- /var/tmp/diff_new_pack.fDvB7r/_old 2018-09-04 22:46:43.351056211 +0200 +++ /var/tmp/diff_new_pack.fDvB7r/_new 2018-09-04 22:46:43.355056225 +0200 @@ -1,8 +1,8 @@ -Index: libssh-0.7.5/tests/unittests/torture_misc.c +Index: libssh-0.8.2/tests/unittests/torture_misc.c =================================================================== ---- libssh-0.7.5.orig/tests/unittests/torture_misc.c -+++ libssh-0.7.5/tests/unittests/torture_misc.c -@@ -180,11 +180,13 @@ static void torture_timeout_elapsed(void +--- libssh-0.8.2.orig/tests/unittests/torture_misc.c 2018-08-30 08:12:50.355846083 +0200 ++++ libssh-0.8.2/tests/unittests/torture_misc.c 2018-08-30 08:12:54.831889573 +0200 +@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void (void) state; ssh_timestamp_init(&ts); usleep(50000); @@ -16,7 +16,7 @@ } static void torture_timeout_update(void **state){ -@@ -192,11 +194,13 @@ static void torture_timeout_update(void +@@ -209,11 +211,13 @@ static void torture_timeout_update(void (void) state; ssh_timestamp_init(&ts); usleep(50000); @@ -29,27 +29,23 @@ +#endif /* SLOW_TEST_SYSTEM */ } - int torture_run_tests(void) { -Index: libssh-0.7.5/DefineOptions.cmake + static void torture_ssh_analyze_banner(void **state) { +Index: libssh-0.8.2/DefineOptions.cmake =================================================================== ---- libssh-0.7.5.orig/DefineOptions.cmake -+++ libssh-0.7.5/DefineOptions.cmake -@@ -14,6 +14,8 @@ option(WITH_CLIENT_TESTING "Build with c - option(WITH_BENCHMARKS "Build benchmarks tools" OFF) - option(WITH_EXAMPLES "Build examples" ON) - option(WITH_NACL "Build with libnacl (curve25519" ON) +--- libssh-0.8.2.orig/DefineOptions.cmake 2018-08-30 08:12:50.355846083 +0200 ++++ libssh-0.8.2/DefineOptions.cmake 2018-08-30 08:13:25.020182668 +0200 +@@ -20,6 +20,7 @@ option(WITH_SYMBOL_VERSIONING "Build wit + option(WITH_ABI_BREAK "Allow ABI break" OFF) + option(FUZZ_TESTING "Build with fuzzer for the server" OFF) + option(PICKY_DEVELOPER "Build with picky developer flags" OFF) +option(SLOW_TEST_SYSTEM "Disable tests that fail on slow systems" OFF) -+ + if (WITH_ZLIB) set(WITH_LIBZ ON) - else (WITH_ZLIB) -@@ -30,4 +32,9 @@ endif (WITH_TESTING) - - if (WITH_NACL) - set(WITH_NACL ON) --endif (WITH_NACL) -\ No newline at end of file -+endif (WITH_NACL) +@@ -46,3 +47,8 @@ endif (WITH_NACL) + if (WITH_ABI_BREAK) + set(WITH_SYMBOL_VERSIONING ON) + endif (WITH_ABI_BREAK) + +if (SLOW_TEST_SYSTEM) + set (SLOW_TEST_SYSTEM ON) ++++++ 0001-poll-Fix-size-types-in-ssh_event_free.patch ++++++ >From 2f69c5f022c4911b1c39dcb302859cecc53d94d1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider <[email protected]> Date: Thu, 30 Aug 2018 08:51:33 +0200 Subject: [PATCH 1/2] poll: Reformat ssh_event_free() Signed-off-by: Andreas Schneider <[email protected]> (cherry picked from commit 8243030c55e4ab277981d3ea69f7863d5acd5da4) --- src/poll.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/poll.c b/src/poll.c index df72c6fa..a12b4d36 100644 --- a/src/poll.c +++ b/src/poll.c @@ -1013,17 +1013,20 @@ int ssh_event_remove_connector(ssh_event event, ssh_connector connector){ * fds before freeing the event object. * */ -void ssh_event_free(ssh_event event) { - int used, i; - ssh_poll_handle p; - if(event == NULL) { +void ssh_event_free(ssh_event event) +{ + int used, i; + ssh_poll_handle p; + + if(event == NULL) { return; } - if(event->ctx != NULL) { + + if (event->ctx != NULL) { used = event->ctx->polls_used; for(i = 0; i < used; i++) { - p = event->ctx->pollptrs[i]; - if(p->session != NULL){ + p = event->ctx->pollptrs[i]; + if (p->session != NULL) { ssh_poll_ctx_remove(event->ctx, p); ssh_poll_ctx_add(p->session->default_poll_ctx, p); p->session = NULL; -- 2.18.0 >From 7458e95ee5047538c3601a4b926c8153e3fe8aa1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider <[email protected]> Date: Thu, 30 Aug 2018 08:52:42 +0200 Subject: [PATCH 2/2] poll: Fix size types in ssh_event_free() src/poll.c:1024:9: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow] Signed-off-by: Andreas Schneider <[email protected]> (cherry picked from commit 11d87238b86732d53378e8acf792838914a38f14) --- src/poll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/poll.c b/src/poll.c index a12b4d36..8f4a0764 100644 --- a/src/poll.c +++ b/src/poll.c @@ -1015,7 +1015,7 @@ int ssh_event_remove_connector(ssh_event event, ssh_connector connector){ */ void ssh_event_free(ssh_event event) { - int used, i; + size_t used, i; ssh_poll_handle p; if(event == NULL) { -- 2.18.0 ++++++ libssh-0.7.5.tar.xz -> libssh-0.8.2.tar.xz ++++++ ++++ 57089 lines of diff (skipped) ++++++ libssh.keyring ++++++ Binary files /var/tmp/diff_new_pack.fDvB7r/_old and /var/tmp/diff_new_pack.fDvB7r/_new differ
