From 03ab03ad06875a89a085a867ceefd0b360aa0b4f Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Sat, 22 Aug 2020 15:24:53 +0200 Subject: [PATCH] libnetconf2: update to 1.1.26 Signed-off-by: Jakov Smolic --- libs/libnetconf2/Makefile | 6 ++--- .../patches/001-cmake_not_updated.patch | 23 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libs/libnetconf2/Makefile b/libs/libnetconf2/Makefile index 5e5945b580..2ef9d982a7 100644 --- a/libs/libnetconf2/Makefile +++ b/libs/libnetconf2/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetconf2 -PKG_VERSION:=1.1.24 +PKG_VERSION:=1.1.26 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/CESNET/libnetconf2/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1a69db028bf970f0dab15ed508b58e0cf0806a7e4492828404b75c97ec8ab306 +PKG_HASH:=2ce2b819f3544fd46a3a4c8ba6dd0a3798cab2a63aa347bc1eb5275a2c89b7bd -PKG_MAINTAINER:=Mislav Novakovic +PKG_MAINTAINER:=Jakov Smolic PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/libs/libnetconf2/patches/001-cmake_not_updated.patch b/libs/libnetconf2/patches/001-cmake_not_updated.patch index f519b9bd6d..61c8107cf4 100644 --- a/libs/libnetconf2/patches/001-cmake_not_updated.patch +++ b/libs/libnetconf2/patches/001-cmake_not_updated.patch @@ -1,11 +1,16 @@ ---- a/CMakeLists.txt 2020-05-08 13:29:30.903800624 +0300 -+++ b/CMakeLists.txt 2020-05-08 13:29:50.943582218 +0300 -@@ -153,7 +153,7 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNC_ENABLED_SSH") - message(STATUS "LibSSH version ${LibSSH_VERSION} found") - -- if(LibSSH_VERSION VERSION_EQUAL 0.9.3 OR LibSSH_VERSION VERSION_EQUAL 0.9.4) -+ if(LibSSH_VERSION VERSION_EQUAL 0.9.x) - message(FATAL_ERROR "LibSSH ${LibSSH_VERSION} includes regression bugs and libnetconf2 will NOT work properly, try to use another version") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f21fec9..5b912af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,7 +148,7 @@ endif() + # dependencies - libssh + if(ENABLE_SSH) + find_package(LibSSH 0.7.0 REQUIRED) +- if(LIBSSH_VERSION VERSION_EQUAL 0.9.3 OR LIBSSH_VERSION VERSION_EQUAL 0.9.4) ++ if(LIBSSH_VERSION VERSION_EQUAL 0.9.x) + message(FATAL_ERROR "LibSSH ${LIBSSH_VERSION} includes regression bugs and libnetconf2 will NOT work properly, try to use another version") endif() +-- +2.26.2 + -- 2.30.2