diff options
| author | Ørjan Malde <red@foxi.me> | 2024-12-22 20:18:16 +0100 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2024-12-22 20:19:22 +0100 |
| commit | 35b051c79899ac321a602e38d35af3f4af8242f7 (patch) | |
| tree | 7f7b4ca18f11ccd0b9d7e1d54e5c5099fcadf9b4 | |
| parent | a53d3c9974e0d52710581a1eb0b2e16b576990dd (diff) | |
| download | midipix_build-35b051c79899ac321a602e38d35af3f4af8242f7.tar.bz2 midipix_build-35b051c79899ac321a602e38d35af3f4af8242f7.tar.xz | |
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups.d/251.native_packages_lib.d/libssh.package | 6 | ||||
| -rw-r--r-- | patches/libssh-0.10.6.local.patch | 10 | ||||
| -rw-r--r-- | patches/libssh-0.11.1_pre.local.patch | 44 |
3 files changed, 47 insertions, 13 deletions
diff --git a/groups.d/251.native_packages_lib.d/libssh.package b/groups.d/251.native_packages_lib.d/libssh.package index 9ad07b5d..6f7ca733 100644 --- a/groups.d/251.native_packages_lib.d/libssh.package +++ b/groups.d/251.native_packages_lib.d/libssh.package @@ -1,6 +1,6 @@ -: ${PKG_LIBSSH_DEPENDS:="libz"}; -: ${PKG_LIBSSH_SHA256SUM:=1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1}; -: ${PKG_LIBSSH_VERSION:=0.10.6}; +: ${PKG_LIBSSH_DEPENDS:="libz libgcrypt"}; +: ${PKG_LIBSSH_SHA256SUM:=14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79}; +: ${PKG_LIBSSH_VERSION:=0.11.1}; : ${PKG_LIBSSH_URL:=https://www.libssh.org/files/${PKG_LIBSSH_VERSION%.*}/libssh-${PKG_LIBSSH_VERSION}.tar.xz}; : ${PKG_LIBSSH_SUBDIR:=libssh-${PKG_LIBSSH_VERSION}}; : ${PKG_LIBSSH_CMAKE_ARGS_EXTRA:=" diff --git a/patches/libssh-0.10.6.local.patch b/patches/libssh-0.10.6.local.patch deleted file mode 100644 index e2525540..00000000 --- a/patches/libssh-0.10.6.local.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ru libssh-0.10.6.orig/libssh.pc.cmake libssh-0.10.6/libssh.pc.cmake ---- libssh-0.10.6.orig/libssh.pc.cmake 2022-11-18 16:16:47.000000000 +0100 -+++ libssh-0.10.6/libssh.pc.cmake 2023-12-19 14:32:21.461084477 +0100 -@@ -6,5 +6,5 @@ - Name: @PROJECT_NAME@ - Description: The SSH Library - Version: @PROJECT_VERSION@ --Libs: -L${libdir} -lssh -+Libs: -lssh - Cflags: -I${includedir} diff --git a/patches/libssh-0.11.1_pre.local.patch b/patches/libssh-0.11.1_pre.local.patch new file mode 100644 index 00000000..0bb9b840 --- /dev/null +++ b/patches/libssh-0.11.1_pre.local.patch @@ -0,0 +1,44 @@ +diff -ru libssh-0.11.1.orig/CMakeLists.txt libssh-0.11.1/CMakeLists.txt +--- libssh-0.11.1.orig/CMakeLists.txt 2024-08-29 15:15:05.000000000 +0200 ++++ libssh-0.11.1/CMakeLists.txt 2024-12-22 20:13:00.884204019 +0100 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.12.0) ++cmake_minimum_required(VERSION 3.7.0) + + # Specify search path for CMake modules to be loaded by include() + # and find_package() +@@ -75,13 +75,6 @@ + endif (NOT NACL_FOUND) + endif (WITH_NACL) + +-# Disable symbol versioning in non UNIX platforms +-if (UNIX) +- find_package(ABIMap 0.3.1) +-else (UNIX) +- set(WITH_SYMBOL_VERSIONING OFF) +-endif (UNIX) +- + # config.h checks + include(ConfigureChecks.cmake) + configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +diff -ru libssh-0.11.1.orig/libssh.pc.cmake libssh-0.11.1/libssh.pc.cmake +--- libssh-0.11.1.orig/libssh.pc.cmake 2024-01-12 14:12:29.000000000 +0100 ++++ libssh-0.11.1/libssh.pc.cmake 2024-12-22 20:16:30.103523223 +0100 +@@ -6,5 +6,5 @@ + Name: @PROJECT_NAME@ + Description: The SSH Library + Version: @PROJECT_VERSION@ +-Libs: -L${libdir} -lssh ++Libs: -lssh + Cflags: -I${includedir} +diff -ru libssh-0.11.1.orig/src/threads/libgcrypt.c libssh-0.11.1/src/threads/libgcrypt.c +--- libssh-0.11.1.orig/src/threads/libgcrypt.c 2024-01-02 16:48:48.000000000 +0100 ++++ libssh-0.11.1/src/threads/libgcrypt.c 2024-12-22 20:13:00.884204019 +0100 +@@ -26,7 +26,6 @@ + + #if (GCRYPT_VERSION_NUMBER >= 0x010600) + /* libgcrypt >= 1.6 does not support custom callbacks */ +-GCRY_THREAD_OPTION_PTHREAD_IMPL; + + int crypto_thread_init(struct ssh_threads_callbacks_struct *user_callbacks) + { |