NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libssh2: bump version to 1.11.0

Browse Source 
Changelog:
https://www.libssh2.org/changes.html
https://lists.haxx.se/pipermail/libssh2-devel/2023-May/000114.html

Removed patch which is included in current release:
b952674f12

Updated license hash due to copyright year bump:
1a186f1ead

Switched tarball to .xz

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2023-06-28 17:03:09 +02:00 committed by Thomas Petazzoni
parent 5ce72a74d2
commit af87ad197c
4 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@ -844,7 +844,6 @@ package/libspatialindex/0001-allow-building-static-libs.patch Upstream
package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream
package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream
package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch Upstream
package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch Upstream
package/libsvg/0001-fix-expat-static-declaration.patch Upstream
package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream
package/libsvgtiny/0001-disable-debug-printfs.patch Upstream

27
package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch
View File

@ -1,27 +0,0 @@
From 7f55a033e5054529e5e69f06725dd02a573329b6 Mon Sep 17 00:00:00 2001
From: Charlie Li <git@vishwin.info>
Date: Wed, 2 Mar 2022 19:50:56 -0500
Subject: [PATCH] Opaque structs in LibreSSL 3.5
[Retrieved (and backported) from:
https://github.com/libssh2/libssh2/pull/682/commits/7f55a033e5054529e5e69f06725dd02a573329b6]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/openssl.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/openssl.h b/src/openssl.h
index 3eef02368..c13542481 100644
--- a/src/openssl.h
+++ b/src/openssl.h
@@ -94,8 +94,8 @@
#include <openssl/pem.h>
#include <openssl/rand.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
# define HAVE_OPAQUE_STRUCTS 1
#endif

4
package/libssh2/libssh2.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51 libssh2-1.10.0.tar.gz
sha256 859e60d760a3446ecaf777339f1eef98c527aea40714384d24b882a83ffdd23a COPYING
sha256 a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2 libssh2-1.11.0.tar.xz
sha256 fda5e2522c58ba1f31c9f2044747616457466f4aebec16ade4af86e3a16a8e02 COPYING

3
package/libssh2/libssh2.mk
View File

@ -4,7 +4,8 @@
#
################################################################################
LIBSSH2_VERSION = 1.10.0
LIBSSH2_VERSION = 1.11.0
LIBSSH2_SOURCE= libssh2-$(LIBSSH2_VERSION).tar.xz
LIBSSH2_SITE = https://www.libssh2.org/download
LIBSSH2_LICENSE = BSD
LIBSSH2_LICENSE_FILES = COPYING