CVS commit: pkgsrc/devel/pkgconf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 13 22:25:00 UTC 2025

Modified Files:
        pkgsrc/devel/pkgconf: distinfo
Added Files:
        pkgsrc/devel/pkgconf/patches: patch-libpkgconf_pkg.c

Log Message:
pkgconf: fix build on SCO/Xinuos UnixWare 7

Using upstream patch, via PR 59556 by Egor.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/pkgconf/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/pkgconf/patches/patch-libpkgconf_pkg.c

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

Modified files:

Index: pkgsrc/devel/pkgconf/distinfo
diff -u pkgsrc/devel/pkgconf/distinfo:1.29 pkgsrc/devel/pkgconf/distinfo:1.30
--- pkgsrc/devel/pkgconf/distinfo:1.29  Sun Mar  9 06:06:44 2025
+++ pkgsrc/devel/pkgconf/distinfo       Sat Sep 13 22:25:00 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.29 2025/03/09 06:06:44 wiz Exp $
+$NetBSD: distinfo,v 1.30 2025/09/13 22:25:00 wiz Exp $
 
 BLAKE2s (pkgconf-2.4.3.tar.gz) = 00ac4cb281356a6ca71a956d31cf5a4348860c21159b287d7188c09e81a435cc
 SHA512 (pkgconf-2.4.3.tar.gz) = 611c3c8d13f1ee4d812a05d37ec0a8cdc4070448e7beb0b2eeb19508e797fc10ae16bed367016b90bc5a54cff016b94c1466f31c6d932d292afebc78051278ba
 Size (pkgconf-2.4.3.tar.gz) = 468948 bytes
+SHA1 (patch-libpkgconf_pkg.c) = 15e6208dd17b79b2bcb341da73f6c8eda5f1d9df

Added files:

Index: pkgsrc/devel/pkgconf/patches/patch-libpkgconf_pkg.c
diff -u /dev/null pkgsrc/devel/pkgconf/patches/patch-libpkgconf_pkg.c:1.3
--- /dev/null   Sat Sep 13 22:25:00 2025
+++ pkgsrc/devel/pkgconf/patches/patch-libpkgconf_pkg.c Sat Sep 13 22:25:00 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-libpkgconf_pkg.c,v 1.3 2025/09/13 22:25:00 wiz Exp $
+
+Fix build on SCO/Xinuos UnixWare 7.
+https://github.com/pkgconf/pkgconf/commit/de3ffe21cfa4026175f5b7212473ce10e2d59485
+
+--- libpkgconf/pkg.c.orig      2025-03-06 00:47:55.000000000 +0000
++++ libpkgconf/pkg.c
+@@ -80,6 +80,8 @@ pkg_get_parent_dir(pkgconf_pkg_t *pkg)
+       struct stat path_stat;
+       while (!lstat(buf, &path_stat) && S_ISLNK(path_stat.st_mode))
+       {
++              char sourcebuf[PKGCONF_ITEM_SIZE];
++
+               /*
+                * Have to split the path into the dir + file components,
+                * in order to extract the directory file descriptor.
+@@ -98,13 +100,16 @@ pkg_get_parent_dir(pkgconf_pkg_t *pkg)
+               pkgconf_strlcpy(dirnamebuf, buf, sizeof(dirnamebuf));
+               const char* targetdir = dirname(dirnamebuf);
+ 
++#ifdef HAVE_DECL_READLINKAT
+               const int dirfd = open(targetdir, O_DIRECTORY);
+               if (dirfd == -1)
+                       break;
+ 
+-              char sourcebuf[PKGCONF_ITEM_SIZE];
+               ssize_t len = readlinkat(dirfd, targetfilename, sourcebuf, sizeof(sourcebuf) - 1);
+               close(dirfd);
++#else
++              ssize_t len = readlink(buf, sourcebuf, sizeof(sourcebuf) - 1);
++#endif
+ 
+               if (len == -1)
+                       break;