CVS commit: pkgsrc/devel/libuuid

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/libuuid
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 28 Dec 2024 14:10:24 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 28 14:10:24 UTC 2024

Modified Files:
        pkgsrc/devel/libuuid: Makefile Makefile.common builtin.mk distinfo
        pkgsrc/devel/libuuid/patches: patch-Makefile.in patch-configure
            patch-include_strutils.h patch-lib_canonicalize.c
            patch-lib_ismounted.c patch-lib_mangle.c patch-lib_signames.c
            patch-lib_sysfs.c patch-lib_ttyutils.c
            patch-libblkid_docs_Makefile.in patch-libfdisk_docs_Makefile.in
            patch-libmount_docs_Makefile.in patch-libsmartcols_docs_Makefile.in
            patch-libuuid_src_gen__uuid.c
Added Files:
        pkgsrc/devel/libuuid/patches: patch-tools_config-gen
Removed Files:
        pkgsrc/devel/libuuid/patches: patch-Makefile.am patch-include_c.h
            patch-include_randutils.h patch-include_ttyutils.h
            patch-lib_colors.c patch-lib_pager.c patch-lib_randutils.c
            patch-libuuid_src_parse.c patch-misc-utils_mcookie.c

Log Message:
libuuid: update to 2.40.2.

Remove patches for stuff fixed upstream, adapt remaining patches.

6 years of development, no concise summary found.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/libuuid/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libuuid/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libuuid/builtin.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libuuid/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libuuid/patches/patch-Makefile.am \
    pkgsrc/devel/libuuid/patches/patch-include_c.h \
    pkgsrc/devel/libuuid/patches/patch-include_randutils.h \
    pkgsrc/devel/libuuid/patches/patch-include_ttyutils.h \
    pkgsrc/devel/libuuid/patches/patch-lib_colors.c \
    pkgsrc/devel/libuuid/patches/patch-lib_pager.c \
    pkgsrc/devel/libuuid/patches/patch-libuuid_src_parse.c \
    pkgsrc/devel/libuuid/patches/patch-misc-utils_mcookie.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libuuid/patches/patch-Makefile.in
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libuuid/patches/patch-configure
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/libuuid/patches/patch-include_strutils.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c \
    pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c \
    pkgsrc/devel/libuuid/patches/patch-lib_mangle.c \
    pkgsrc/devel/libuuid/patches/patch-lib_signames.c \
    pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c \
    pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c \
    pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in
cvs rdiff -u -r1.6 -r0 pkgsrc/devel/libuuid/patches/patch-lib_randutils.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuuid/patches/patch-tools_config-gen

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

Modified files:

Index: pkgsrc/devel/libuuid/Makefile
diff -u pkgsrc/devel/libuuid/Makefile:1.25 pkgsrc/devel/libuuid/Makefile:1.26
--- pkgsrc/devel/libuuid/Makefile:1.25  Mon Aug 14 05:24:12 2023
+++ pkgsrc/devel/libuuid/Makefile       Sat Dec 28 14:10:23 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2023/08/14 05:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/12/28 14:10:23 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/util-linux/libuuid/}
-PKGREVISION=   2
 CATEGORIES=    devel
 COMMENT=       Generate unique identifiers for objects
 LICENSE=       modified-bsd

Index: pkgsrc/devel/libuuid/Makefile.common
diff -u pkgsrc/devel/libuuid/Makefile.common:1.9 pkgsrc/devel/libuuid/Makefile.common:1.10
--- pkgsrc/devel/libuuid/Makefile.common:1.9    Wed Mar  8 03:13:32 2023
+++ pkgsrc/devel/libuuid/Makefile.common        Sat Dec 28 14:10:23 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2023/03/08 03:13:32 charlotte Exp $
+# $NetBSD: Makefile.common,v 1.10 2024/12/28 14:10:23 wiz Exp $
 # used by devel/libblkid/Makefile
 # used by devel/libuuid/Makefile
 # used by x11/mcookie/Makefile
 
-DISTNAME=      util-linux-2.32.1
+DISTNAME=      util-linux-2.40.2
 MASTER_SITES=  https://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
 EXTRACT_USING= bsdtar
@@ -16,7 +16,6 @@ PATCHDIR=     ${.CURDIR}/../../devel/libuuid
 
 USE_GCC_RUNTIME=       yes
 USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-all-programs
 CONFIGURE_ARGS+=       --disable-bash-completion
@@ -29,19 +28,3 @@ CONFIGURE_ARGS+=     --without-python
 CONFIGURE_ARGS+=       --disable-nls
 
 TEST_TARGET=           check
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-# XXX PR pkg/52877: configure is broken on netbsd6
-.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 070000)
-USE_TOOLS+=    ksh
-CONFIG_SHELL=  ksh
-.endif
-
-# DragonFly has a cpu_set_t (not to be confused with cpuset_t), but util-linux
-# incorrectly assumes that its contents are identical to those on Linux.
-# Therefore, behave like NetBSD et al. and assume we *don't* have cpu_set_t
-# after all.
-.if (${OPSYS} == "DragonFly")
-CONFIGURE_ARGS+=       ac_cv_type_cpu_set_t=no
-.endif

Index: pkgsrc/devel/libuuid/builtin.mk
diff -u pkgsrc/devel/libuuid/builtin.mk:1.14 pkgsrc/devel/libuuid/builtin.mk:1.15
--- pkgsrc/devel/libuuid/builtin.mk:1.14        Mon Mar 11 18:06:05 2024
+++ pkgsrc/devel/libuuid/builtin.mk     Sat Dec 28 14:10:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2024/03/11 18:06:05 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.15 2024/12/28 14:10:23 wiz Exp $
 
 BUILTIN_PKG:=  libuuid
 
@@ -29,7 +29,7 @@ MAKEVARS+=            IS_BUILTIN.libuuid
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.libuuid) && \
-    !empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
+    ${IS_BUILTIN.libuuid:tl} == yes
 .  if empty(UUID_PC:M__nonexistent__)
 BUILTIN_VERSION.libuuid!=      \
        ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${UUID_PC:Q}
@@ -49,11 +49,11 @@ USE_BUILTIN.libuuid=        no
 .  else
 USE_BUILTIN.libuuid=   ${IS_BUILTIN.libuuid}
 .    if defined(BUILTIN_PKG.libuuid) && \
-        !empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
+        ${IS_BUILTIN.libuuid:tl} == yes
 USE_BUILTIN.libuuid=   yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.libuuid}
-.        if !empty(USE_BUILTIN.libuuid:M[yY][eE][sS])
-USE_BUILTIN.libuuid!=      \
+.        if ${USE_BUILTIN.libuuid:tl} == yes
+USE_BUILTIN.libuuid!=                                                  \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libuuid:Q}; then \
                ${ECHO} yes;                                            \
        else                                                            \
@@ -71,8 +71,8 @@ MAKEVARS+=            USE_BUILTIN.libuuid
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.libuuid?=        no
-.if !empty(CHECK_BUILTIN.libuuid:M[nN][oO])
-.  if !empty(USE_BUILTIN.libuuid:M[yY][eE][sS])
+.if ${CHECK_BUILTIN.libuuid:tl} == no
+.  if ${USE_BUILTIN.libuuid:tl} == yes
 BUILDLINK_TARGETS+=    libuuid-fake-pc
 
 .    if ${OPSYS} == "SunOS"
@@ -84,6 +84,7 @@ LIBUUID_LDADD=                        -L/lib
 BUILDLINK_TRANSFORM+=          rm:-luuid
 .    endif
 
+.PHONY: libuuid-fake-pc
 libuuid-fake-pc:
        ${RUN}                                          \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig;        \

Index: pkgsrc/devel/libuuid/distinfo
diff -u pkgsrc/devel/libuuid/distinfo:1.26 pkgsrc/devel/libuuid/distinfo:1.27
--- pkgsrc/devel/libuuid/distinfo:1.26  Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/distinfo       Sat Dec 28 14:10:23 2024
@@ -1,28 +1,20 @@
-$NetBSD: distinfo,v 1.26 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: distinfo,v 1.27 2024/12/28 14:10:23 wiz Exp $
 
-BLAKE2s (util-linux-2.32.1.tar.xz) = 396ab70d86492b47f63c0e2b2447d5a95169046b8f37ac0f9480166c09167847
-SHA512 (util-linux-2.32.1.tar.xz) = 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
-Size (util-linux-2.32.1.tar.xz) = 4561088 bytes
-SHA1 (patch-Makefile.am) = a3470f6d286ca7c7ddebf27f9a205507b67f836d
-SHA1 (patch-Makefile.in) = a415bb922d7154387f71882b1f1fa06c9e49c174
-SHA1 (patch-configure) = 400904ae2e58b717e990ba26c111b90bc8f240d1
-SHA1 (patch-include_c.h) = 4596369e4b742329be513952c66d1fa3705de017
-SHA1 (patch-include_randutils.h) = d28ade8554d218f2af4a815a611b833b2036a5eb
-SHA1 (patch-include_strutils.h) = abb960a2ce6fe9f22ef178aea4db17aac5e0df70
-SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
-SHA1 (patch-lib_canonicalize.c) = 8e05ead75f6cef89e02b4915f6128a1ebd97bcc0
-SHA1 (patch-lib_colors.c) = a7f6c7700bcf1352037253486d16657dfa2804d3
-SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
-SHA1 (patch-lib_mangle.c) = b0acd6dbb28e429ca55d33cdccfb71a525d86b5d
-SHA1 (patch-lib_pager.c) = 3d4b65f9ccb6437bcc0777634660b5ae3150d14e
-SHA1 (patch-lib_randutils.c) = aece9cb8ec033966d535955654cc27263b3c4976
-SHA1 (patch-lib_signames.c) = ed5939c887c90bd5c9eeb6df047e5d7d22cb34f3
-SHA1 (patch-lib_sysfs.c) = a55660f82b6f88938eae0cd185d9db048a73d4ed
-SHA1 (patch-lib_ttyutils.c) = 093fe0d8755366e5e5ede3f3b4df193918c424db
-SHA1 (patch-libblkid_docs_Makefile.in) = 97a1559dad77e32d78bd504d8d3523b9cc403c36
-SHA1 (patch-libfdisk_docs_Makefile.in) = def97b85e8760cd18af736ab331e2f476f0c9c67
-SHA1 (patch-libmount_docs_Makefile.in) = a55063e89161221cecda661039d0a62174592669
-SHA1 (patch-libsmartcols_docs_Makefile.in) = aa44d1a9ffd9bf4422ed8892d91b4e0e72e50407
-SHA1 (patch-libuuid_src_gen__uuid.c) = 94d190ffca4357e62c6b0ae90fdc9a7456e10468
-SHA1 (patch-libuuid_src_parse.c) = 39396e6d96d0402ce8b0cf739641a73a467a4dd2
-SHA1 (patch-misc-utils_mcookie.c) = 1456f47881552162b1ba6218c620f23648eceb6c
+BLAKE2s (util-linux-2.40.2.tar.xz) = e83f6b7f6b202ca27e8829ed7d70c4a37054925652f72de810908c4590f9ae68
+SHA512 (util-linux-2.40.2.tar.xz) = ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2
+Size (util-linux-2.40.2.tar.xz) = 8854820 bytes
+SHA1 (patch-Makefile.in) = 0d581288a8415719722cd095e71cf36a3d8cbf6a
+SHA1 (patch-configure) = 578db2e08fa28066732079d4efff3aa97837a7e5
+SHA1 (patch-include_strutils.h) = e993e6a5665b759c596bd1a46217f4c05fdcb120
+SHA1 (patch-lib_canonicalize.c) = 1eee2273016ed673f062f38e80f8a30f1304a7d5
+SHA1 (patch-lib_ismounted.c) = ee9b3ea5dc4173790e3fc5207f860e8b6fbc29d5
+SHA1 (patch-lib_mangle.c) = cad7b1fbb51205b973f963b9c372f0884b882db7
+SHA1 (patch-lib_signames.c) = 51b09ef417d96534849f34b97b4057c286ceeca7
+SHA1 (patch-lib_sysfs.c) = d981fb4418197cb2cc9b9fb2a706935827ae9893
+SHA1 (patch-lib_ttyutils.c) = 0d84094920b632669c7198b1f1be07880d613e74
+SHA1 (patch-libblkid_docs_Makefile.in) = 9c73547eb2dd921193ebd092bf2eb5d80f58df26
+SHA1 (patch-libfdisk_docs_Makefile.in) = 9b6b61aa33833b57159f81b3c662e3d097870515
+SHA1 (patch-libmount_docs_Makefile.in) = cba6e071e4b26896ca6bae47ae47ebe662b2da4a
+SHA1 (patch-libsmartcols_docs_Makefile.in) = c3a77d42252be62b979467f0ad84ed0f44ef6f30
+SHA1 (patch-libuuid_src_gen__uuid.c) = 05dd91d2fe44f4cfd82120e52a7be1dab80d0ea2
+SHA1 (patch-tools_config-gen) = f36e05c517d625e5b0b3fce1d5a8b3f2b02c7def

Index: pkgsrc/devel/libuuid/patches/patch-Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.4 pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.5
--- pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.4  Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-Makefile.in      Sat Dec 28 14:10:23 2024
@@ -1,58 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.4 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2024/12/28 14:10:23 wiz Exp $
 
-Linker script depends on non-portable constructs.
-Do not compile setproctitle; it conflicts with NetBSD and is not needed.
-Do not build common libraries.
 Do not install terminal-colors.d.5.
+Fix unportable test(1) operator.
 
---- Makefile.in.orig   2018-07-16 10:34:43.896171527 +0000
+--- Makefile.in.orig   2024-07-04 08:01:08.682964852 +0000
 +++ Makefile.in
-@@ -186,7 +186,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
- 
- @BUILD_LIBUUID_TRUE@am__append_15 = test_uuid_parser
- @BUILD_LIBUUID_TRUE@am__append_16 = libuuid.la
--@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_TRUE@am__append_17 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
-+@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_COMPLEX_TRUE@am__append_17 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
- @BUILD_LIBUUID_TRUE@am__append_18 = libuuid/src/libuuid.sym \
- @BUILD_LIBUUID_TRUE@  libuuid/COPYING
- @BUILD_LIBUUID_TRUE@am__append_19 = install-exec-hook-libuuid
-@@ -204,7 +204,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
- 
- @BUILD_LIBBLKID_TRUE@@BUILD_LIBUUID_TRUE@am__append_25 = libuuid.la
- @BUILD_LIBBLKID_TRUE@@BUILD_LIBUUID_TRUE@am__append_26 = -I$(ul_libuuid_incdir)
--@BUILD_LIBBLKID_TRUE@@HAVE_VSCRIPT_TRUE@am__append_27 = $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym
-+@BUILD_LIBBLKID_TRUE@@HAVE_VSCRIPT_COMPLEX_TRUE@am__append_27 = $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym
- @BUILD_LIBBLKID_TRUE@am__append_28 = libblkid/src/libblkid.sym \
- @BUILD_LIBBLKID_TRUE@ libblkid/COPYING
- @BUILD_LIBBLKID_TESTS_TRUE@@BUILD_LIBBLKID_TRUE@am__append_29 = \
-@@ -1032,7 +1032,7 @@ am__libcommon_la_SOURCES_DIST = lib/blkd
-       lib/fileutils.c lib/ismounted.c lib/color-names.c lib/mangle.c \
-       lib/match.c lib/mbsalign.c lib/mbsedit.c lib/md5.c lib/pager.c \
-       lib/parse-date.y lib/path.c lib/pwdutils.c lib/randutils.c \
--      lib/setproctitle.c lib/strutils.c lib/timeutils.c \
-+      lib/strutils.c lib/timeutils.c \
-       lib/ttyutils.c lib/exec_shell.c lib/strv.c lib/sha1.c \
-       lib/signames.c lib/linux_version.c lib/loopdev.c \
-       lib/plymouth-ctrl.c lib/langinfo.c lib/cpuset.c \
-@@ -1055,7 +1055,7 @@ am_libcommon_la_OBJECTS = lib/libcommon_
-       lib/libcommon_la-md5.lo lib/libcommon_la-pager.lo \
-       lib/libcommon_la-parse-date.lo lib/libcommon_la-path.lo \
-       lib/libcommon_la-pwdutils.lo lib/libcommon_la-randutils.lo \
--      lib/libcommon_la-setproctitle.lo lib/libcommon_la-strutils.lo \
-+      lib/libcommon_la-strutils.lo \
-       lib/libcommon_la-timeutils.lo lib/libcommon_la-ttyutils.lo \
-       lib/libcommon_la-exec_shell.lo lib/libcommon_la-strv.lo \
-       lib/libcommon_la-sha1.lo lib/libcommon_la-signames.lo \
-@@ -3827,7 +3827,7 @@ dist_noinst_HEADERS = include/all-io.h i
-       include/timer.h include/timeutils.h include/ttyutils.h \
-       include/widechar.h include/xalloc.h
- noinst_LTLIBRARIES = libcommon.la libtcolors.la
--dist_man_MANS = lib/terminal-colors.d.5 $(am__append_14) \
-+dist_man_MANS = $(am__append_14) \
-       $(am__append_38) $(am__append_78) $(am__append_80) \
-       $(am__append_82) $(am__append_84) $(am__append_86) \
-       $(am__append_88) $(am__append_90) $(am__append_92) \
-@@ -12816,7 +12816,7 @@ checkusage:
+@@ -5782,7 +5782,7 @@ ADOCFILES_COMMON = man-common/bugreports
+       man-common/footer-lib.adoc man-common/help-version.adoc \
+       man-common/in-bytes.adoc man-common/manpage-stub.adoc \
+       man-common/translation.adoc
+-MANPAGES = lib/terminal-colors.d.5 $(am__append_21) $(am__append_32) \
++MANPAGES = $(am__append_21) $(am__append_32) \
+       $(am__append_56) $(am__append_90) $(am__append_107) \
+       $(am__append_110) $(am__append_113) $(am__append_116) \
+       $(am__append_119) $(am__append_122) $(am__append_125) \
+@@ -19005,7 +19005,7 @@ checklibdoc:
        echo $(VERSION) > $@-t && mv $@-t $@
  
  $(CHANGELOG_FILE):

Index: pkgsrc/devel/libuuid/patches/patch-configure
diff -u pkgsrc/devel/libuuid/patches/patch-configure:1.8 pkgsrc/devel/libuuid/patches/patch-configure:1.9
--- pkgsrc/devel/libuuid/patches/patch-configure:1.8    Wed Aug 29 12:25:52 2018
+++ pkgsrc/devel/libuuid/patches/patch-configure        Sat Dec 28 14:10:23 2024
@@ -1,71 +1,26 @@
-$NetBSD: patch-configure,v 1.8 2018/08/29 12:25:52 adam Exp $
+$NetBSD: patch-configure,v 1.9 2024/12/28 14:10:23 wiz Exp $
 
-Add --disable-uuidgen and --disable-mcookie.
-Shell portability.
+Add option for enabling/disabling mcookie.
 
---- configure.orig     2017-10-19 11:10:01.000000000 +0000
+--- configure.orig     2024-07-04 08:01:06.791975965 +0000
 +++ configure
-@@ -1250,6 +1250,7 @@ enable_zramctl
- enable_fsck
- enable_partx
- enable_uuidd
-+enable_uuidgen
- enable_mountpoint
- enable_fallocate
- enable_unshare
-@@ -1269,6 +1270,7 @@ enable_lslogins
+@@ -1440,6 +1440,7 @@ enable_lslogins
  enable_wdctl
  enable_cal
  enable_logger
 +enable_mcookie
- enable_switch_root
- enable_pivot_root
- enable_lsmem
-@@ -2024,6 +2026,7 @@ Optional Features:
-   --disable-fsck          do not build fsck
-   --disable-partx         do not build addpart, delpart, partx
-   --disable-uuidd         do not build the uuid daemon
-+  --disable-uuidgen       do not build uuidgen
-   --disable-mountpoint    do not build mountpoint
-   --disable-fallocate     do not build fallocate
-   --disable-unshare       do not build unshare
-@@ -2043,6 +2046,7 @@ Optional Features:
+ enable_whereis
+ enable_pipesz
+ enable_waitpid
+@@ -2274,6 +2275,7 @@ Optional Features:
    --disable-wdctl         do not build wdctl
    --disable-cal           do not build cal
    --disable-logger        do not build logger
 +  --disable-mcookie       do not build mcookie
-   --disable-switch_root   do not build switch_root
-   --disable-pivot_root    do not build pivot_root
-   --disable-lsmem         do not build lsmem
-@@ -23311,17 +23315,22 @@ fi
- 
- 
- 
-+# Check whether --enable-uuidgen was given.
-+if test "${enable_uuidgen+set}" = set; then :
-+  enableval=$enable_uuidgen;
-+else
- 
-   if test "x$ul_default_estate" != x; then
-   enable_uuidgen=$ul_default_estate
--  build_uuidgen=yes
--  if test "x$ul_default_estate" = xno; then
--    build_uuidgen=no
-+  else
-+  enable_uuidgen=check
-   fi
--else
-+fi
- 
-+if test "x$enable_uuidgen" = xno; then
-+  build_uuidgen=no
-+else
-   build_uuidgen=yes
--  enable_uuidgen=check
- fi
- 
- 
-@@ -25956,17 +25965,23 @@ fi
+   --disable-whereis       do not build whereis
+   --disable-pipesz        do not build pipesz
+   --disable-waitpid       do not build waitpid
+@@ -36220,17 +36222,23 @@ fi
  
  
  

Index: pkgsrc/devel/libuuid/patches/patch-include_strutils.h
diff -u pkgsrc/devel/libuuid/patches/patch-include_strutils.h:1.3 pkgsrc/devel/libuuid/patches/patch-include_strutils.h:1.4
--- pkgsrc/devel/libuuid/patches/patch-include_strutils.h:1.3   Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-include_strutils.h       Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_strutils.h,v 1.3 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-include_strutils.h,v 1.4 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- include/strutils.h.orig    2018-06-04 07:57:02.792445890 +0000
+--- include/strutils.h.orig    2024-07-04 07:54:41.223242118 +0000
 +++ include/strutils.h
-@@ -162,14 +162,14 @@ static inline const char *endswith(const
+@@ -276,14 +276,14 @@ static inline const char *endswith(const
   */
  static inline const char *skip_space(const char *p)
  {

Index: pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c:1.1   Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-lib_canonicalize.c       Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_canonicalize.c,v 1.1 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-lib_canonicalize.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- lib/canonicalize.c.orig    2018-07-11 13:34:54.227003733 +0000
+--- lib/canonicalize.c.orig    2024-01-31 10:02:15.454811603 +0000
 +++ lib/canonicalize.c
-@@ -57,7 +57,7 @@ static int is_dm_devname(char *canonical
+@@ -69,7 +69,7 @@ static int is_dm_devname(char *canonical
  
        if (!p
            || strncmp(p, "/dm-", 4) != 0
Index: pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c:1.1      Fri Dec  8 08:03:35 2017
+++ pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c  Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ismounted.c,v 1.1 2017/12/08 08:03:35 adam Exp $
+$NetBSD: patch-lib_ismounted.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix build on NetBSD.
 
---- lib/ismounted.c.orig       2016-11-02 12:57:31.000000000 +0000
+--- lib/ismounted.c.orig       2024-01-31 10:02:15.456811591 +0000
 +++ lib/ismounted.c
-@@ -214,7 +214,11 @@ static int check_mntent(const char *file
+@@ -215,7 +215,11 @@ static int check_mntent(const char *file
  static int check_getmntinfo(const char *file, int *mount_flags,
                                  char *mtpt, int mtlen)
  {
Index: pkgsrc/devel/libuuid/patches/patch-lib_mangle.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_mangle.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_mangle.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_mangle.c:1.1 Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-lib_mangle.c     Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_mangle.c,v 1.1 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-lib_mangle.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- lib/mangle.c.orig  2018-06-04 07:57:02.793445882 +0000
+--- lib/mangle.c.orig  2024-01-31 10:02:15.457811585 +0000
 +++ lib/mangle.c
-@@ -80,9 +80,11 @@ size_t unhexmangle_to_buffer(const char 
+@@ -81,9 +81,11 @@ size_t unhexmangle_to_buffer(const char 
  
        while(*s && sz < len - 1) {
                if (*s == '\\' && sz + 3 < len - 1 && s[1] == 'x' &&
Index: pkgsrc/devel/libuuid/patches/patch-lib_signames.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_signames.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_signames.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_signames.c:1.1       Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-lib_signames.c   Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_signames.c,v 1.1 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-lib_signames.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- lib/signames.c.orig        2018-06-04 07:57:02.794445874 +0000
+--- lib/signames.c.orig        2024-01-31 10:02:15.459811574 +0000
 +++ lib/signames.c
-@@ -144,7 +144,7 @@ static int rtsig_to_signum(const char *s
+@@ -114,7 +114,7 @@ static int rtsig_to_signum(const char *s
                sig += 4;
                maxi = 1;
        }
Index: pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c:1.1  Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-lib_sysfs.c      Sat Dec 28 14:10:24 2024
@@ -1,18 +1,17 @@
-$NetBSD: patch-lib_sysfs.c,v 1.1 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-lib_sysfs.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- lib/sysfs.c.orig   2018-07-11 13:34:54.228003727 +0000
+--- lib/sysfs.c.orig   2024-06-27 10:10:35.311994946 +0000
 +++ lib/sysfs.c
-@@ -346,8 +346,9 @@ int sysfs_is_partition_dirent(DIR *dir, 
+@@ -233,8 +233,8 @@ int sysfs_blkdev_is_partition_dirent(DIR
+               /* partitions subdir name is
                 *      "<parent>[:digit:]" or "<parent>p[:digit:]"
                 */
-               return strncmp(p, d->d_name, len) == 0 &&
--                     ((*(d->d_name + len) == 'p' && isdigit(*(d->d_name + len + 1)))
+-              return ((*(d->d_name + len) == 'p' && isdigit(*(d->d_name + len + 1)))
 -                      || isdigit(*(d->d_name + len)));
-+                     ((*(d->d_name + len) == 'p' &&
-+                         isdigit((unsigned char)*(d->d_name + len + 1)))
-+                      || isdigit((unsigned char)*(d->d_name + len)));
++              return ((*(d->d_name + len) == 'p' && isdigit((unsigned char)*(d->d_name + len + 1)))
++                      || isdigit((unsigned char)*(d->d_name + len)));
        }
  
        /* Cannot use /partition file, not supported on old sysfs */
Index: pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c:1.1 pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c:1.2
--- pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c:1.1       Sat Apr  2 21:00:54 2022
+++ pkgsrc/devel/libuuid/patches/patch-lib_ttyutils.c   Sat Dec 28 14:10:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ttyutils.c,v 1.1 2022/04/02 21:00:54 riastradh Exp $
+$NetBSD: patch-lib_ttyutils.c,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
 Fix ctype(3) abuse.
 
---- lib/ttyutils.c.orig        2018-07-11 13:34:54.228003727 +0000
+--- lib/ttyutils.c.orig        2024-05-28 08:12:08.105260290 +0000
 +++ lib/ttyutils.c
-@@ -104,7 +104,7 @@ int get_terminal_name(const char **path,
+@@ -144,7 +144,7 @@ int get_terminal_name(const char **path,
                *name = tty;
        if (number) {
                for (p = tty; p && *p; p++) {
Index: pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in:1.1 pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in:1.2
--- pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in:1.1    Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in        Sat Dec 28 14:10:24 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-libblkid_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: patch-libblkid_docs_Makefile.in,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
---- libblkid/docs/Makefile.in.orig     2018-07-16 10:34:43.928171337 +0000
+Fix unportable test(1) operator.
+
+--- libblkid/docs/Makefile.in.orig     2024-07-04 08:01:08.722964617 +0000
 +++ libblkid/docs/Makefile.in
-@@ -806,7 +806,7 @@ distclean-local:
+@@ -847,7 +847,7 @@ distclean-local:
        rm -rf xml html $(REPORT_FILES) *.stamp \
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
Index: pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in:1.1 pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in:1.2
--- pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in:1.1    Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in        Sat Dec 28 14:10:24 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-libfdisk_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: patch-libfdisk_docs_Makefile.in,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
---- libfdisk/docs/Makefile.in.orig     2018-07-16 10:34:43.952171193 +0000
+Fix unportable test(1) operator.
+
+--- libfdisk/docs/Makefile.in.orig     2024-07-04 08:01:08.750964452 +0000
 +++ libfdisk/docs/Makefile.in
-@@ -803,7 +803,7 @@ distclean-local:
+@@ -844,7 +844,7 @@ distclean-local:
        rm -rf xml html $(REPORT_FILES) *.stamp \
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
Index: pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in:1.1 pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in:1.2
--- pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in:1.1    Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in        Sat Dec 28 14:10:24 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-libmount_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: patch-libmount_docs_Makefile.in,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
---- libmount/docs/Makefile.in.orig     2018-07-16 10:34:43.977171044 +0000
+Fix unportable test(1) operator.
+
+--- libmount/docs/Makefile.in.orig     2024-07-04 08:01:08.778964288 +0000
 +++ libmount/docs/Makefile.in
-@@ -803,7 +803,7 @@ distclean-local:
+@@ -844,7 +844,7 @@ distclean-local:
        rm -rf xml html $(REPORT_FILES) *.stamp \
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
Index: pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in:1.1 pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in:1.2
--- pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in:1.1        Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in    Sat Dec 28 14:10:24 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-libsmartcols_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: patch-libsmartcols_docs_Makefile.in,v 1.2 2024/12/28 14:10:24 wiz Exp $
 
---- libsmartcols/docs/Makefile.in.orig 2018-07-16 10:34:44.001170901 +0000
+Fix unportable test(1) operator.
+
+--- libsmartcols/docs/Makefile.in.orig 2024-07-04 08:01:08.807964117 +0000
 +++ libsmartcols/docs/Makefile.in
-@@ -803,7 +803,7 @@ distclean-local:
+@@ -844,7 +844,7 @@ distclean-local:
        rm -rf xml html $(REPORT_FILES) *.stamp \
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt

Index: pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c
diff -u pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c:1.2 pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c:1.3
--- pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c:1.2      Sun Jul 25 04:00:34 2021
+++ pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c  Sat Dec 28 14:10:24 2024
@@ -1,12 +1,11 @@
-$NetBSD: patch-libuuid_src_gen__uuid.c,v 1.2 2021/07/25 04:00:34 dholland Exp $
+$NetBSD: patch-libuuid_src_gen__uuid.c,v 1.3 2024/12/28 14:10:24 wiz Exp $
 
-fcntl is portable, flock is not.
 Solaris does not have ifr.ifr_hwaddr.
-Rename random_get_bytes to avoid symbol name conflict on Solaris.
+fcntl is portable, flock is not.
 
---- libuuid/src/gen_uuid.c.orig        2018-06-04 07:57:02.805445789 +0000
+--- libuuid/src/gen_uuid.c.orig        2024-07-04 07:54:41.230242078 +0000
 +++ libuuid/src/gen_uuid.c
-@@ -172,7 +172,7 @@ static int get_node_id(unsigned char *no
+@@ -167,7 +167,7 @@ static int get_node_id(unsigned char *no
        for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
                ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
                strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
@@ -15,26 +14,22 @@ Rename random_get_bytes to avoid symbol 
                if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
                        continue;
                a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
-@@ -227,12 +227,17 @@ static int get_clock(uint32_t *clock_hig
-       THREAD_LOCAL int                state_fd = -2;
+@@ -246,16 +246,22 @@ static int get_clock(uint32_t *clock_hig
+       THREAD_LOCAL int                state_fd = STATE_FD_INIT;
        THREAD_LOCAL FILE               *state_f;
        THREAD_LOCAL uint16_t           clock_seq;
 +      struct flock                    lock;
        struct timeval                  tv;
        uint64_t                        clock_reg;
-       mode_t                          save_umask;
-       int                             len;
        int                             ret = 0;
  
 +      lock.l_whence = SEEK_SET;
 +      lock.l_start = 0;
 +      lock.l_len = 0;
 +
-       if (state_fd == -1)
-               ret = -1;
+       if (state_fd == STATE_FD_INIT)
+               state_fd = state_fd_init(LIBUUID_CLOCK_FILE, &state_f);
  
-@@ -253,7 +258,8 @@ static int get_clock(uint32_t *clock_hig
-       }
        if (state_fd >= 0) {
                rewind(state_f);
 -              while (flock(state_fd, LOCK_EX) < 0) {
@@ -43,18 +38,9 @@ Rename random_get_bytes to avoid symbol 
                        if ((errno == EAGAIN) || (errno == EINTR))
                                continue;
                        fclose(state_f);
-@@ -278,7 +284,7 @@ static int get_clock(uint32_t *clock_hig
-       }
- 
-       if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
--              random_get_bytes(&clock_seq, sizeof(clock_seq));
-+              my_random_get_bytes(&clock_seq, sizeof(clock_seq));
-               clock_seq &= 0x3FFF;
-               gettimeofday(&last, NULL);
-               last.tv_sec--;
-@@ -325,7 +331,8 @@ try_again:
-                       fflush(state_f);
-               }
+@@ -334,7 +340,8 @@ try_again:
+                             clock_seq, (long)last.tv_sec, (long)last.tv_usec, adjustment);
+               fflush(state_f);
                rewind(state_f);
 -              flock(state_fd, LOCK_UN);
 +              lock.l_type = F_UNLCK;
@@ -62,21 +48,3 @@ Rename random_get_bytes to avoid symbol 
        }
  
        *clock_high = clock_reg >> 32;
-@@ -416,7 +423,7 @@ int __uuid_generate_time(uuid_t out, int
- 
-       if (!has_init) {
-               if (get_node_id(node_id) <= 0) {
--                      random_get_bytes(node_id, 6);
-+                      my_random_get_bytes(node_id, 6);
-                       /*
-                        * Set multicast bit, to prevent conflicts
-                        * with IEEE 802 addresses obtained from
-@@ -514,7 +521,7 @@ void __uuid_generate_random(uuid_t out, 
-               n = *num;
- 
-       for (i = 0; i < n; i++) {
--              random_get_bytes(buf, sizeof(buf));
-+              my_random_get_bytes(buf, sizeof(buf));
-               uuid_unpack(buf, &uu);
- 
-               uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;

Added files:

Index: pkgsrc/devel/libuuid/patches/patch-tools_config-gen
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-tools_config-gen:1.1
--- /dev/null   Sat Dec 28 14:10:24 2024
+++ pkgsrc/devel/libuuid/patches/patch-tools_config-gen Sat Dec 28 14:10:24 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_config-gen,v 1.1 2024/12/28 14:10:24 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- tools/config-gen.orig      2024-01-31 10:02:15.850809328 +0000
++++ tools/config-gen
+@@ -30,7 +30,7 @@ fi
+ 
+ while [ -n "$1" ]; do
+       opts="$opts $(ul_get_configuration tools/config-gen.d/$1.conf)"
+-      if [ "$1" == "fuzz" ]; then
++      if [ "$1" = "fuzz" ]; then
+               export CC=${CC:-clang}
+               export CXX=${CXX:-clang++}
+       fi

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index