Received: by mail.netbsd.org (Postfix, from userid 605) id 4A0E884E87; Tue, 9 Jan 2024 15:54:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7B3AC84E76 for ; Tue, 9 Jan 2024 15:54:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 3Vha3JabAIlE for ; Tue, 9 Jan 2024 15:53:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 90E3684D1D for ; Tue, 9 Jan 2024 15:53:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 88EA5FA42; Tue, 9 Jan 2024 15:53:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1704815639187670" MIME-Version: 1.0 Date: Tue, 9 Jan 2024 15:53:59 +0000 From: "Christian E. Hopps" Subject: CVS commit: pkgsrc/devel/libyang2 To: pkgsrc-changes@NetBSD.org Reply-To: chopps@netbsd.org X-Mailer: log_accum Message-Id: <20240109155359.88EA5FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1704815639187670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: chopps Date: Tue Jan 9 15:53:59 UTC 2024 Modified Files: pkgsrc/devel/libyang2: Makefile PLIST buildlink3.mk distinfo Added Files: pkgsrc/devel/libyang2/patches: patch-CMakeModules_UseCompat.cmake patch-compat_compat.c Log Message: devel/libyang2: update to version 2.1.128 In addition add support for a run the test suite when testing is enabled. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libyang2/Makefile \ pkgsrc/devel/libyang2/PLIST cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libyang2/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libyang2/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/libyang2/patches/patch-CMakeModules_UseCompat.cmake \ pkgsrc/devel/libyang2/patches/patch-compat_compat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1704815639187670 Content-Disposition: inline Content-Length: 6901 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libyang2/Makefile diff -u pkgsrc/devel/libyang2/Makefile:1.1 pkgsrc/devel/libyang2/Makefile:1.2 --- pkgsrc/devel/libyang2/Makefile:1.1 Wed Aug 11 09:49:42 2021 +++ pkgsrc/devel/libyang2/Makefile Tue Jan 9 15:53:59 2024 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2021/08/11 09:49:42 kardel Exp $ +# $NetBSD: Makefile,v 1.2 2024/01/09 15:53:59 chopps Exp $ GITHUB_PROJECT= libyang -GITHUB_TAG= v2.0.7 -DISTNAME= v2.0.7 +GITHUB_TAG= v2.1.128 +DISTNAME= v2.1.128 PKGNAME= ${GITHUB_PROJECT}2-${DISTNAME:S,^v,,} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=CESNET/} @@ -14,8 +14,7 @@ HOMEPAGE= https://github.com/CESNET/liby COMMENT= YANG data modeling language library LICENSE= modified-bsd -WRKSRC= ${WRKDIR}/libyang-2.0.7 -USE_CMAKE= yes +WRKSRC= ${WRKDIR}/libyang-2.1.128 USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ @@ -24,16 +23,12 @@ TOOL_DEPENDS+= cmocka>=1.1.5:../../devel PKGCONFIG_OVERRIDE+= libyang.pc.in PKGCONFIG_OVERRIDE+= swig/libyang-cpp.pc.in -CMAKE_ARG_PATH= .. -CONFIGURE_DIRS= _build - .include "../../mk/bsd.prefs.mk" -pre-configure: - ${MKDIR} ${WRKSRC}/_build - -CMAKE_ARGS?= -DCMAKE_BUILD_TYPE:String="Release" +CMAKE_ARGS?= -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE:String="Release" +TEST_TARGET?= test +.include "../../devel/cmocka/buildlink3.mk" .include "../../devel/pcre2/buildlink3.mk" - +.include "../../devel/cmake/build.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/libyang2/PLIST diff -u pkgsrc/devel/libyang2/PLIST:1.1 pkgsrc/devel/libyang2/PLIST:1.2 --- pkgsrc/devel/libyang2/PLIST:1.1 Wed Aug 11 09:49:42 2021 +++ pkgsrc/devel/libyang2/PLIST Tue Jan 9 15:53:59 2024 @@ -1,19 +1,19 @@ -@comment $NetBSD: PLIST,v 1.1 2021/08/11 09:49:42 kardel Exp $ +@comment $NetBSD: PLIST,v 1.2 2024/01/09 15:53:59 chopps Exp $ bin/yanglint bin/yangre include/libyang/config.h include/libyang/context.h include/libyang/dict.h +include/libyang/hash_table.h include/libyang/in.h include/libyang/libyang.h include/libyang/log.h +include/libyang/metadata.h include/libyang/out.h include/libyang/parser_data.h include/libyang/parser_schema.h include/libyang/plugins.h include/libyang/plugins_exts.h -include/libyang/plugins_exts_compile.h -include/libyang/plugins_exts_print.h include/libyang/plugins_types.h include/libyang/printer_data.h include/libyang/printer_schema.h @@ -25,6 +25,15 @@ include/libyang/tree_schema.h include/libyang/version.h lib/libyang.so lib/libyang.so.2 -lib/libyang.so.2.1.4 +lib/libyang.so.2.41.0 lib/pkgconfig/libyang.pc man/man1/yanglint.1 +man/man1/yangre.1 +share/yang/modules/libyang/ietf-datastores@2018-02-14.yang +share/yang/modules/libyang/ietf-inet-types@2013-07-15.yang +share/yang/modules/libyang/ietf-yang-library@2019-01-04.yang +share/yang/modules/libyang/ietf-yang-metadata@2016-08-05.yang +share/yang/modules/libyang/ietf-yang-schema-mount@2019-01-14.yang +share/yang/modules/libyang/ietf-yang-structure-ext@2020-06-17.yang +share/yang/modules/libyang/ietf-yang-types@2013-07-15.yang +share/yang/modules/libyang/yang@2022-06-16.yang Index: pkgsrc/devel/libyang2/buildlink3.mk diff -u pkgsrc/devel/libyang2/buildlink3.mk:1.2 pkgsrc/devel/libyang2/buildlink3.mk:1.3 --- pkgsrc/devel/libyang2/buildlink3.mk:1.2 Wed Aug 11 09:53:36 2021 +++ pkgsrc/devel/libyang2/buildlink3.mk Tue Jan 9 15:53:59 2024 @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2021/08/11 09:53:36 kardel Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2024/01/09 15:53:59 chopps Exp $ BUILDLINK_TREE+= libyang2 .if !defined(LIBYANG2_BUILDLINK3_MK) LIBYANG2_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libyang2+= libyang2>=2.0.7 +BUILDLINK_API_DEPENDS.libyang2+= libyang2>=2.1.128 BUILDLINK_PKGSRCDIR.libyang2?= ../../devel/libyang2 TOOL_DEPENDS+= cmocka>=1.1.5:../../devel/cmocka Index: pkgsrc/devel/libyang2/distinfo diff -u pkgsrc/devel/libyang2/distinfo:1.3 pkgsrc/devel/libyang2/distinfo:1.4 --- pkgsrc/devel/libyang2/distinfo:1.3 Tue Oct 26 10:15:31 2021 +++ pkgsrc/devel/libyang2/distinfo Tue Jan 9 15:53:59 2024 @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 10:15:31 nia Exp $ +$NetBSD: distinfo,v 1.4 2024/01/09 15:53:59 chopps Exp $ -BLAKE2s (libyang/v2.0.7.tar.gz) = 34c6bdf38d145dffe6002661ec62100397457d491676af03f039c3f53c688f79 -SHA512 (libyang/v2.0.7.tar.gz) = edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7 -Size (libyang/v2.0.7.tar.gz) = 1031818 bytes +BLAKE2s (libyang/v2.1.128.tar.gz) = d23c83ad49389ec4e0a7351373dbce1f467082f3a99ad4a75af4fc3f55532001 +SHA512 (libyang/v2.1.128.tar.gz) = 506dcb58e6d8682cd1ad47252ddd98b8e093c11be8198169b754834a8e36315884672ee534b1c30abc27be1399417f4497291a2589aa35740189e60f5c9532d8 +Size (libyang/v2.1.128.tar.gz) = 1262102 bytes +SHA1 (patch-CMakeModules_UseCompat.cmake) = 8511976a8c789e6a8476e57bb5f3ac10ae19af5b +SHA1 (patch-compat_compat.c) = 9ba1bbbb1efc7e738fbc80e6af6b0f3d7a86e1be Added files: Index: pkgsrc/devel/libyang2/patches/patch-CMakeModules_UseCompat.cmake diff -u /dev/null pkgsrc/devel/libyang2/patches/patch-CMakeModules_UseCompat.cmake:1.1 --- /dev/null Tue Jan 9 15:53:59 2024 +++ pkgsrc/devel/libyang2/patches/patch-CMakeModules_UseCompat.cmake Tue Jan 9 15:53:59 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-CMakeModules_UseCompat.cmake,v 1.1 2024/01/09 15:53:59 chopps Exp $ + +Expose realpath(). + +--- CMakeModules/UseCompat.cmake.orig 2023-10-11 07:55:04.000000000 +0000 ++++ CMakeModules/UseCompat.cmake +@@ -28,6 +28,8 @@ macro(USE_COMPAT) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -D__BSD_VISIBLE=1) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_DEFAULT_SOURCE) ++ list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_XOPEN_SOURCE) ++ list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_XOPEN_SOURCE_EXTENDED) + set(CMAKE_REQUIRED_LIBRARIES pthread) + + check_symbol_exists(vdprintf "stdio.h;stdarg.h" HAVE_VDPRINTF) Index: pkgsrc/devel/libyang2/patches/patch-compat_compat.c diff -u /dev/null pkgsrc/devel/libyang2/patches/patch-compat_compat.c:1.1 --- /dev/null Tue Jan 9 15:53:59 2024 +++ pkgsrc/devel/libyang2/patches/patch-compat_compat.c Tue Jan 9 15:53:59 2024 @@ -0,0 +1,27 @@ +$NetBSD: patch-compat_compat.c,v 1.1 2024/01/09 15:53:59 chopps Exp $ + +NetBSD has realpath() this is unneeded. + +--- compat/compat.c.orig 2023-10-11 07:55:04.000000000 +0000 ++++ compat/compat.c +@@ -268,20 +268,6 @@ realpath(const char *path, char *resolve + } + return resolved; + } +- +-#elif defined (__NetBSD__) +-char * +-realpath(const char *path, char *resolved_path) +-{ +- ssize_t nbytes; +- +- nbytes = readlink(path, resolved_path, PATH_MAX); +- if (nbytes == -1) { +- return NULL; +- } +- return resolved_path; +-} +- + #else + #error No realpath() implementation for this platform is available. + #endif --_----------=_1704815639187670--