Date: Sat, 02 May 2026 12:01:54 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5f1736b8a7d6 - main - devel/ding-libs: Update to 0.7.0 Message-ID: <69f5e7b2.34ab0.38ed8920@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f1736b8a7d6b1dc4b98538422d33353d675e06d commit 5f1736b8a7d6b1dc4b98538422d33353d675e06d Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-04-18 17:48:55 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-05-02 12:01:46 +0000 devel/ding-libs: Update to 0.7.0 --- devel/ding-libs/Makefile | 5 +- devel/ding-libs/distinfo | 6 +- devel/ding-libs/files/patch-ini_ini__metadata.c | 87 +++++++++++++++++++++++++ devel/ding-libs/pkg-plist | 29 +-------- 4 files changed, 94 insertions(+), 33 deletions(-) diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile index dec79e749551..cb0840b7c025 100644 --- a/devel/ding-libs/Makefile +++ b/devel/ding-libs/Makefile @@ -1,5 +1,5 @@ PORTNAME= ding-libs -PORTVERSION= 0.6.2 +PORTVERSION= 0.7.0 CATEGORIES= devel MASTER_SITES= https://github.com/SSSD/ding-libs/releases/download/${PORTVERSION}/ @@ -12,7 +12,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER -USES= iconv gettext-runtime libtool localbase +USES= iconv gettext-runtime libtool localbase pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -27,6 +27,5 @@ OPTIONS_DEFINE= DOCS TEST # libcheck is required to run *all* the unit tests. # Without it only 14/20 tests will run. TEST_BUILD_DEPENDS= check>=0:devel/check -TEST_USES= pkgconfig .include <bsd.port.mk> diff --git a/devel/ding-libs/distinfo b/devel/ding-libs/distinfo index dc5580e82495..2dd0a0af025a 100644 --- a/devel/ding-libs/distinfo +++ b/devel/ding-libs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763824955 -SHA256 (ding-libs-0.6.2.tar.gz) = e5f07f34f5921bcb5ccccfe3751c28497879a6451cd7b395e99e24d9b5728e8d -SIZE (ding-libs-0.6.2.tar.gz) = 957577 +TIMESTAMP = 1776504320 +SHA256 (ding-libs-0.7.0.tar.gz) = 5df2f202f892b4c1a6caf87f0056398a8288b281da9d7e65cd7637978ec20ef3 +SIZE (ding-libs-0.7.0.tar.gz) = 967529 diff --git a/devel/ding-libs/files/patch-ini_ini__metadata.c b/devel/ding-libs/files/patch-ini_ini__metadata.c new file mode 100644 index 000000000000..b4a593fed032 --- /dev/null +++ b/devel/ding-libs/files/patch-ini_ini__metadata.c @@ -0,0 +1,87 @@ +--- ini/ini_metadata.c.orig 2026-02-10 07:24:13 UTC ++++ ini/ini_metadata.c +@@ -172,8 +172,8 @@ int collect_metadata(uint32_t metaflags, + } + + /* Modification time stamp */ +- snprintf(buff, CONVERSION_BUFFER, "%ld", +- (long int)file_stats.st_mtime); ++ snprintf(buff, CONVERSION_BUFFER, "%lld", ++ (long long)file_stats.st_mtime); + error = col_add_str_property(metasec, + NULL, + INI_META_KEY_MODIFIED, +@@ -197,23 +197,11 @@ int collect_metadata(uint32_t metaflags, + return error; + } + +- /* The device ID can actualy be bigger than +- * 32-bits according to the type sizes. +- * However it is probaly not going to happen +- * on a real system. +- * Add a check for this case. +- */ +- if (file_stats.st_dev > ULONG_MAX) { +- TRACE_ERROR_NUMBER("Device is out of range", ERANGE); +- col_destroy_collection(metasec); +- return ERANGE; +- } +- + /* Device ID */ + TRACE_INFO_LNUMBER("Device ID", file_stats.st_dev); + +- snprintf(buff, CONVERSION_BUFFER, "%lu", +- (unsigned long)file_stats.st_dev); ++ snprintf(buff, CONVERSION_BUFFER, "%llu", ++ (unsigned long long)file_stats.st_dev); + error = col_add_str_property(metasec, + NULL, + INI_META_KEY_DEV, +@@ -226,8 +214,8 @@ int collect_metadata(uint32_t metaflags, + } + + /* i-node */ +- snprintf(buff, CONVERSION_BUFFER, "%lu", +- (unsigned long)file_stats.st_ino); ++ snprintf(buff, CONVERSION_BUFFER, "%llu", ++ (unsigned long long)file_stats.st_ino); + error = col_add_str_property(metasec, + NULL, + INI_META_KEY_INODE, +@@ -414,14 +402,14 @@ int config_access_check(struct collection_item *metada + + } + +-static unsigned long get_checked_value(struct collection_item *metadata, ++static unsigned long long get_checked_value(struct collection_item *metadata, + const char *key, + int *err) + { + + int error = EOK; + struct collection_item *item = NULL; +- unsigned long value; ++ unsigned long long value; + + TRACE_FLOW_STRING("get_checked_value", "Entry"); + TRACE_INFO_STRING("Key", key); +@@ -445,8 +433,8 @@ static unsigned long get_checked_value(struct collecti + return 0; + } + +- value = get_ulong_config_value(item, 1, -1, &error); +- if ((error) || (value == -1)) { ++ value = (unsigned long long)get_uint64_config_value(item, 1, 0, &error); ++ if (error) { + TRACE_ERROR_NUMBER("Conversion failed", EINVAL); + *err = EINVAL; + return 0; +@@ -467,7 +455,7 @@ int config_changed(struct collection_item *metadata, + { + int error = EOK; + struct collection_item *md[2]; +- unsigned long value[3][2]; ++ unsigned long long value[3][2]; + const char *key[] = { INI_META_KEY_MODIFIED, + INI_META_KEY_DEV, + INI_META_KEY_INODE }; diff --git a/devel/ding-libs/pkg-plist b/devel/ding-libs/pkg-plist index cc14ce6c6c12..9eebb0bf0357 100644 --- a/devel/ding-libs/pkg-plist +++ b/devel/ding-libs/pkg-plist @@ -1,40 +1,15 @@ -include/collection.h -include/collection_queue.h -include/collection_stack.h -include/collection_tools.h include/dhash.h -include/ini_comment.h -include/ini_config.h include/ini_configmod.h include/ini_configobj.h -include/ini_valueobj.h -include/path_utils.h include/ref_array.h -include/simplebuffer.h -lib/libbasicobjects.so -lib/libbasicobjects.so.0 -lib/libbasicobjects.so.0.1.0 -lib/libcollection.so -lib/libcollection.so.4 -lib/libcollection.so.4.1.1 lib/libdhash.so lib/libdhash.so.1 lib/libdhash.so.1.1.0 lib/libini_config.so -lib/libini_config.so.5 -lib/libini_config.so.5.2.1 -lib/libpath_utils.so -lib/libpath_utils.so.1 -lib/libpath_utils.so.1.0.1 -lib/libref_array.so -lib/libref_array.so.1 -lib/libref_array.so.1.2.1 -libdata/pkgconfig/basicobjects.pc -libdata/pkgconfig/collection.pc +lib/libini_config.so.8 +lib/libini_config.so.8.0.0 libdata/pkgconfig/dhash.pc libdata/pkgconfig/ini_config.pc -libdata/pkgconfig/path_utils.pc -libdata/pkgconfig/ref_array.pc %%PORTDOCS%%%%DOCSDIR%%/README.dhash %%PORTDOCS%%%%DOCSDIR%%/README.path_utils %%PORTDOCS%%%%DOCSDIR%%/README.ref_arrayhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f5e7b2.34ab0.38ed8920>