From 791084abf7455bc57e86f90d09391982bf1f1b11 Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Mon, 21 Feb 2022 02:06:42 +0200 Subject: [PATCH] updated frr7 --- devel/libyang/Makefile | 4 ++-- devel/libyang/distinfo | 6 +++--- devel/libyang/files/patch-x-CMakeLists.txt | 25 ++++++++++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/devel/libyang/Makefile b/devel/libyang/Makefile index 23419991..d955bd19 100644 --- a/devel/libyang/Makefile +++ b/devel/libyang/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: head/net/libyang/Makefile 507372 2019-07-26 20:46:53Z gerald $ PORTNAME= libyang -PORTVERSION= 1.0 +PORTVERSION= 1.0.240 DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= -r4 +#DISTVERSIONSUFFIX= -r4 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org diff --git a/devel/libyang/distinfo b/devel/libyang/distinfo index 3e82bcd4..82aa98cc 100644 --- a/devel/libyang/distinfo +++ b/devel/libyang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571824441 -SHA256 (CESNET-libyang-v1.0-r4_GH0.tar.gz) = 411f0c675b0858f8deabc0545e33fbd791ff7c7a5b7d2c27e347e3973d5b8ae4 -SIZE (CESNET-libyang-v1.0-r4_GH0.tar.gz) = 3017685 +TIMESTAMP = 1645401193 +SHA256 (CESNET-libyang-v1.0.240_GH0.tar.gz) = 8576cad398b451b1c622b0652a2030fcf83ee1d9a39e6cd93d17b0a5a43118d6 +SIZE (CESNET-libyang-v1.0.240_GH0.tar.gz) = 1667619 diff --git a/devel/libyang/files/patch-x-CMakeLists.txt b/devel/libyang/files/patch-x-CMakeLists.txt index 9468eb2b..abb10b9f 100644 --- a/devel/libyang/files/patch-x-CMakeLists.txt +++ b/devel/libyang/files/patch-x-CMakeLists.txt @@ -1,11 +1,24 @@ ---- ./CMakeLists.txt.orig 2019-10-23 12:10:30.173465000 +0200 -+++ ./CMakeLists.txt 2019-10-23 12:10:49.065795000 +0200 -@@ -30,7 +30,7 @@ +--- ./CMakeLists.txt.orig 2021-05-31 12:11:46.000000000 +0200 ++++ ./CMakeLists.txt 2022-02-21 01:56:33.121543000 +0200 +@@ -33,9 +33,9 @@ + # Major version is changed with every backward non-compatible API/ABI change in libyang, minor version changes + # with backward compatible change and micro version is connected with any internal change of the library. set(LIBYANG_MAJOR_SOVERSION 1) - set(LIBYANG_MINOR_SOVERSION 2) - set(LIBYANG_MICRO_SOVERSION 2) +-set(LIBYANG_MINOR_SOVERSION 10) +-set(LIBYANG_MICRO_SOVERSION 32) -set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) ++set(LIBYANG_MINOR_SOVERSION 2) ++set(LIBYANG_MICRO_SOVERSION 2) +set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}) set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION}) - # set default build type if not specified by user + set(libsrc +@@ -125,7 +125,7 @@ + option(ENABLE_LATEST_REVISIONS "Enable reusing of latest revisions of schemas" ON) + option(ENABLE_LYD_PRIV "Add a private pointer also to struct lyd_node (data node structure), just like in struct lys_node, for arbitrary user data" OFF) + option(ENABLE_FUZZ_TARGETS "Build target programs suitable for fuzzing with AFL" OFF) +-set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang${LIBYANG_MAJOR_SOVERSION}" CACHE STRING "Directory with libyang plugins (extensions and user types), should include major SO version") ++set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang" CACHE STRING "Directory with libyang plugins (extensions and user types), should include major SO version") + + if(ENABLE_CACHE) + set(LY_ENABLED_CACHE 1)