CVS commit: pkgsrc/devel/editorconfig-core

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Jan 13 14:32:36 UTC 2024

Modified Files:
        pkgsrc/devel/editorconfig-core: Makefile PLIST distinfo options.mk

Log Message:
Update editorconfig-core to version 0.12.6

Pkgsrc changes:
Use cmake/build.mk instead of USE_CMAKE.

Changes from changelog:
Fix memory leak in editorconfig_parse() that would
occur if no .editorconfig files were found in the
file's ancestry if an error occured while ingesting
value.
Fix potential buffer overflow in ec_glob.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/editorconfig-core/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/editorconfig-core/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/editorconfig-core/distinfo \
    pkgsrc/devel/editorconfig-core/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/editorconfig-core/Makefile
diff -u pkgsrc/devel/editorconfig-core/Makefile:1.5 pkgsrc/devel/editorconfig-core/Makefile:1.6
--- pkgsrc/devel/editorconfig-core/Makefile:1.5 Wed Nov 30 23:20:25 2022
+++ pkgsrc/devel/editorconfig-core/Makefile     Sat Jan 13 14:32:36 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/11/30 23:20:25 nros Exp $
+# $NetBSD: Makefile,v 1.6 2024/01/13 14:32:36 nros Exp $
 
-DISTNAME=      editorconfig-core-c-0.12.4
+DISTNAME=      editorconfig-core-c-0.12.6
 PKGNAME=       ${DISTNAME:S/c-//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=editorconfig/}
@@ -12,11 +12,11 @@ HOMEPAGE=   http://www.editorconfig.org/
 COMMENT=       Editorconfig C library
 LICENSE=       2-clause-bsd
 
-USE_CMAKE=     yes
-
 PKGCONFIG_OVERRIDE=    src/lib/editorconfig.pc.in
 
 .include "options.mk"
 
+.include "../../devel/cmake/build.mk"
+
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/editorconfig-core/PLIST
diff -u pkgsrc/devel/editorconfig-core/PLIST:1.2 pkgsrc/devel/editorconfig-core/PLIST:1.3
--- pkgsrc/devel/editorconfig-core/PLIST:1.2    Sat Mar 20 18:52:45 2021
+++ pkgsrc/devel/editorconfig-core/PLIST        Sat Jan 13 14:32:36 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/20 18:52:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/01/13 14:32:36 nros Exp $
 bin/editorconfig
 bin/editorconfig-${PKGVERSION}
 include/editorconfig/editorconfig.h
@@ -8,8 +8,8 @@ lib/cmake/EditorConfig/EditorConfigConfi
 lib/cmake/EditorConfig/EditorConfigTargets-noconfig.cmake
 lib/cmake/EditorConfig/EditorConfigTargets.cmake
 lib/libeditorconfig.so
-lib/libeditorconfig.so.${PKGVERSION}
 lib/libeditorconfig.so.0
+lib/libeditorconfig.so.${PKGVERSION}
 lib/libeditorconfig_static.a
 lib/pkgconfig/editorconfig.pc
 ${PLIST.doc}man/man1/editorconfig.1
@@ -17,13 +17,19 @@ ${PLIST.doc}man/man3/editorconfig.h.3
 ${PLIST.doc}man/man3/editorconfig_handle.h.3
 ${PLIST.doc}man/man5/editorconfig-format.5
 ${PLIST.doc}share/doc/editorconfig/html/bc_s.png
-${PLIST.doc}share/doc/editorconfig/html/bdwn.png
+${PLIST.doc}share/doc/editorconfig/html/bc_sd.png
+${PLIST.doc}share/doc/editorconfig/html/clipboard.js
 ${PLIST.doc}share/doc/editorconfig/html/closed.png
-${PLIST.doc}share/doc/editorconfig/html/dir_000000.html
-${PLIST.doc}share/doc/editorconfig/html/dir_000001.html
-${PLIST.doc}share/doc/editorconfig/html/doc.png
+${PLIST.doc}share/doc/editorconfig/html/cookie.js
+${PLIST.doc}share/doc/editorconfig/html/dir_d436eb0fd9de10b54a828ce6435f7e81.html
+${PLIST.doc}share/doc/editorconfig/html/dir_d436eb0fd9de10b54a828ce6435f7e81.js
+${PLIST.doc}share/doc/editorconfig/html/dir_e09e7f32063909b80102ab7dafe583fc.html
+${PLIST.doc}share/doc/editorconfig/html/dir_e09e7f32063909b80102ab7dafe583fc.js
+${PLIST.doc}share/doc/editorconfig/html/doc.svg
+${PLIST.doc}share/doc/editorconfig/html/docd.svg
 ${PLIST.doc}share/doc/editorconfig/html/doxygen.css
 ${PLIST.doc}share/doc/editorconfig/html/doxygen.svg
+${PLIST.doc}share/doc/editorconfig/html/doxygen_crawl.html
 ${PLIST.doc}share/doc/editorconfig/html/dynsections.js
 ${PLIST.doc}share/doc/editorconfig/html/editorconfig-format.html
 ${PLIST.doc}share/doc/editorconfig/html/editorconfig.html
@@ -35,8 +41,10 @@ ${PLIST.doc}share/doc/editorconfig/html/
 ${PLIST.doc}share/doc/editorconfig/html/editorconfig__handle_8h_source.html
 ${PLIST.doc}share/doc/editorconfig/html/files.html
 ${PLIST.doc}share/doc/editorconfig/html/files_dup.js
-${PLIST.doc}share/doc/editorconfig/html/folderclosed.png
-${PLIST.doc}share/doc/editorconfig/html/folderopen.png
+${PLIST.doc}share/doc/editorconfig/html/folderclosed.svg
+${PLIST.doc}share/doc/editorconfig/html/folderclosedd.svg
+${PLIST.doc}share/doc/editorconfig/html/folderopen.svg
+${PLIST.doc}share/doc/editorconfig/html/folderopend.svg
 ${PLIST.doc}share/doc/editorconfig/html/globals.html
 ${PLIST.doc}share/doc/editorconfig/html/globals_defs.html
 ${PLIST.doc}share/doc/editorconfig/html/globals_func.html
@@ -46,42 +54,61 @@ ${PLIST.doc}share/doc/editorconfig/html/
 ${PLIST.doc}share/doc/editorconfig/html/logo.png
 ${PLIST.doc}share/doc/editorconfig/html/menu.js
 ${PLIST.doc}share/doc/editorconfig/html/menudata.js
+${PLIST.doc}share/doc/editorconfig/html/minus.svg
+${PLIST.doc}share/doc/editorconfig/html/minusd.svg
 ${PLIST.doc}share/doc/editorconfig/html/nav_f.png
+${PLIST.doc}share/doc/editorconfig/html/nav_fd.png
 ${PLIST.doc}share/doc/editorconfig/html/nav_g.png
 ${PLIST.doc}share/doc/editorconfig/html/nav_h.png
+${PLIST.doc}share/doc/editorconfig/html/nav_hd.png
 ${PLIST.doc}share/doc/editorconfig/html/navtree.css
 ${PLIST.doc}share/doc/editorconfig/html/navtree.js
 ${PLIST.doc}share/doc/editorconfig/html/navtreedata.js
 ${PLIST.doc}share/doc/editorconfig/html/navtreeindex0.js
 ${PLIST.doc}share/doc/editorconfig/html/open.png
 ${PLIST.doc}share/doc/editorconfig/html/pages.html
+${PLIST.doc}share/doc/editorconfig/html/plus.svg
+${PLIST.doc}share/doc/editorconfig/html/plusd.svg
 ${PLIST.doc}share/doc/editorconfig/html/resize.js
-${PLIST.doc}share/doc/editorconfig/html/search/all_0.html
 ${PLIST.doc}share/doc/editorconfig/html/search/all_0.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_1.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_2.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_3.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_4.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_5.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_6.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_7.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_8.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_9.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_a.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_b.js
+${PLIST.doc}share/doc/editorconfig/html/search/all_c.js
 ${PLIST.doc}share/doc/editorconfig/html/search/close.svg
-${PLIST.doc}share/doc/editorconfig/html/search/defines_0.html
 ${PLIST.doc}share/doc/editorconfig/html/search/defines_0.js
-${PLIST.doc}share/doc/editorconfig/html/search/files_0.html
 ${PLIST.doc}share/doc/editorconfig/html/search/files_0.js
-${PLIST.doc}share/doc/editorconfig/html/search/functions_0.html
 ${PLIST.doc}share/doc/editorconfig/html/search/functions_0.js
+${PLIST.doc}share/doc/editorconfig/html/search/mag.svg
+${PLIST.doc}share/doc/editorconfig/html/search/mag_d.svg
 ${PLIST.doc}share/doc/editorconfig/html/search/mag_sel.svg
-${PLIST.doc}share/doc/editorconfig/html/search/nomatches.html
-${PLIST.doc}share/doc/editorconfig/html/search/pages_0.html
+${PLIST.doc}share/doc/editorconfig/html/search/mag_seld.svg
 ${PLIST.doc}share/doc/editorconfig/html/search/pages_0.js
+${PLIST.doc}share/doc/editorconfig/html/search/pages_1.js
+${PLIST.doc}share/doc/editorconfig/html/search/pages_2.js
+${PLIST.doc}share/doc/editorconfig/html/search/pages_3.js
 ${PLIST.doc}share/doc/editorconfig/html/search/search.css
 ${PLIST.doc}share/doc/editorconfig/html/search/search.js
-${PLIST.doc}share/doc/editorconfig/html/search/search_l.png
-${PLIST.doc}share/doc/editorconfig/html/search/search_m.png
-${PLIST.doc}share/doc/editorconfig/html/search/search_r.png
 ${PLIST.doc}share/doc/editorconfig/html/search/searchdata.js
-${PLIST.doc}share/doc/editorconfig/html/search/typedefs_0.html
 ${PLIST.doc}share/doc/editorconfig/html/search/typedefs_0.js
 ${PLIST.doc}share/doc/editorconfig/html/splitbar.png
+${PLIST.doc}share/doc/editorconfig/html/splitbard.png
 ${PLIST.doc}share/doc/editorconfig/html/sync_off.png
 ${PLIST.doc}share/doc/editorconfig/html/sync_on.png
 ${PLIST.doc}share/doc/editorconfig/html/tab_a.png
+${PLIST.doc}share/doc/editorconfig/html/tab_ad.png
 ${PLIST.doc}share/doc/editorconfig/html/tab_b.png
+${PLIST.doc}share/doc/editorconfig/html/tab_bd.png
 ${PLIST.doc}share/doc/editorconfig/html/tab_h.png
+${PLIST.doc}share/doc/editorconfig/html/tab_hd.png
 ${PLIST.doc}share/doc/editorconfig/html/tab_s.png
+${PLIST.doc}share/doc/editorconfig/html/tab_sd.png
 ${PLIST.doc}share/doc/editorconfig/html/tabs.css

Index: pkgsrc/devel/editorconfig-core/distinfo
diff -u pkgsrc/devel/editorconfig-core/distinfo:1.4 pkgsrc/devel/editorconfig-core/distinfo:1.5
--- pkgsrc/devel/editorconfig-core/distinfo:1.4 Tue Oct 26 10:14:35 2021
+++ pkgsrc/devel/editorconfig-core/distinfo     Sat Jan 13 14:32:36 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:14:35 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/01/13 14:32:36 nros Exp $
 
-BLAKE2s (editorconfig-core-c-0.12.4.tar.gz) = 58a5c4da3fa41a1346a8a4014d4b032d7494e1e474104c772948e2fc9d121ef4
-SHA512 (editorconfig-core-c-0.12.4.tar.gz) = e275d4f77fddd31717a588be15a67a630e693efbddc5e1cf7e9b116b1c1a700fa9bafc1322733aa73a009c78519e00083b151bbc4a5ad55128df2c7360f9a163
-Size (editorconfig-core-c-0.12.4.tar.gz) = 72141 bytes
+BLAKE2s (editorconfig-core-c-0.12.6.tar.gz) = 79086e4142b46e68d208b943e6656e233216bdb2caf9df0e0bd3233b9b284b80
+SHA512 (editorconfig-core-c-0.12.6.tar.gz) = 7cf69ed48c0d28694fc1f54cd8ae89202a3f0a13b5302fd316f50d0f99a606f54af9709874f0da75ad11ab6f4cc36edacb4cd8639717d44842a309140be3a968
+Size (editorconfig-core-c-0.12.6.tar.gz) = 76525 bytes
Index: pkgsrc/devel/editorconfig-core/options.mk
diff -u pkgsrc/devel/editorconfig-core/options.mk:1.4 pkgsrc/devel/editorconfig-core/options.mk:1.5
--- pkgsrc/devel/editorconfig-core/options.mk:1.4       Tue Jun  6 12:40:37 2023
+++ pkgsrc/devel/editorconfig-core/options.mk   Sat Jan 13 14:32:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2023/06/06 12:40:37 riastradh Exp $
+# $NetBSD: options.mk,v 1.5 2024/01/13 14:32:36 nros Exp $
 PKG_OPTIONS_VAR=       PKG_OPTIONS.editorconfig-core
 PKG_SUPPORTED_OPTIONS= doc
 
@@ -7,12 +7,12 @@ PKG_SUPPORTED_OPTIONS=        doc
 ###
 ### Build and install html documentation and man pages
 ###
-PLIST_VARS+=   doc
+PLIST_VARS+=           doc
 .if !empty(PKG_OPTIONS:Mdoc)
-TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
-CMAKE_ARGS+=   -DBUILD_DOCUMENTATION=ON
-CMAKE_ARGS+=   -DINSTALL_HTML_DOC=ON
-PLIST.doc=     yes
+TOOL_DEPENDS+=         doxygen-[0-9]*:../../devel/doxygen
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCUMENTATION=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_HTML_DOC=ON
+PLIST.doc=             yes
 .else
-CMAKE_ARGS+=   -DBUILD_DOCUMENTATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCUMENTATION=OFF
 .endif