diff mbox series

[1/1] package/libssh2: bump version to 1.11.0

Message ID 20230628150309.544293-1-bernd@kuhls.net
State Accepted
Headers show
Series [1/1] package/libssh2: bump version to 1.11.0 | expand

Commit Message

Bernd Kuhls June 28, 2023, 3:03 p.m. UTC 
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:
https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac

Updated license hash due to copyright year bump:
https://github.com/libssh2/libssh2/commit/1a186f1ead5ab0beca1fcc12aa693c166ef855b8

Switched tarball to .xz

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .checkpackageignore                           |  1 -
 .../0001-Opaque-structs-in-LibreSSL-3-5.patch | 27 -------------------
 package/libssh2/libssh2.hash                  |  4 +--
 package/libssh2/libssh2.mk                    |  3 ++-
 4 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch

Comments

Thomas Petazzoni July 1, 2023, 1:24 p.m. UTC | #1 
On Wed, 28 Jun 2023 17:03:09 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> 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:
> https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac
> 
> Updated license hash due to copyright year bump:
> https://github.com/libssh2/libssh2/commit/1a186f1ead5ab0beca1fcc12aa693c166ef855b8
> 
> Switched tarball to .xz
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .checkpackageignore                           |  1 -
>  .../0001-Opaque-structs-in-LibreSSL-3-5.patch | 27 -------------------
>  package/libssh2/libssh2.hash                  |  4 +--
>  package/libssh2/libssh2.mk                    |  3 ++-
>  4 files changed, 4 insertions(+), 31 deletions(-)
>  delete mode 100644 package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index 6f9c8b90dc..3c38e34eb7 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -836,7 +836,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
diff --git a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch b/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch
deleted file mode 100644
index 2e1fd8871c..0000000000
--- a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch
+++ /dev/null
@@ -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
- 
diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash
index 7267e85987..b5bc571f86 100644
--- a/package/libssh2/libssh2.hash
+++ b/package/libssh2/libssh2.hash
@@ -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
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index cd74784d82..8bedbdffba 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -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