From 0266e9380f400247ff4dd89ac165210168d8813a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 9 Apr 2022 15:12:17 +0000 Subject: Prepare for 2.2.4.1; adapt to skalibs-2.12.0.0 Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 2 +- NEWS | 6 ++++++ doc/index.html | 4 ++-- doc/upgrade.html | 6 ++++++ package/info | 2 +- src/skaembutils/s6-uniquename.c | 4 +--- src/skaembutils/s6-update-symlinks.c | 3 +-- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index 9e95f25..0dfd4b1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2021 Laurent Bercot +Copyright (c) 2011-2022 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 50149cb..b0b28ee 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.11.2.0 or later: https://skarnet.org/software/skalibs/ + - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/NEWS b/NEWS index 0a39a4e..a15ed67 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-portable-utils. +In 2.2.4.1 +---------- + + - Adaptation to skalibs-2.12.0.0. + + In 2.2.4.0 ---------- diff --git a/doc/index.html b/doc/index.html index d4530f1..2c43bb3 100644 --- a/doc/index.html +++ b/doc/index.html @@ -74,7 +74,7 @@ on the wrong page. I apologize for the confusion.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.11.2.0 or later. It's a build-time requirement. It's also a run-time +2.12.0.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
    • @@ -90,7 +90,7 @@ library.
    • The current released version of s6-portable-utils is -2.2.4.0.
      • +2.2.4.1.
    • Alternatively, you can checkout a copy of the s6-portable-utils git repository: diff --git a/doc/upgrade.html b/doc/upgrade.html index 24077e3..ad8ef6d 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@

      What has changed in s6-portable-utils

      +

      in 2.2.4.1

      + +
        +
      • No functional changes.
        • +
      +

      in 2.2.4.0

        diff --git a/package/info b/package/info index e55f97b..d69da52 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-portable-utils -version=2.2.4.0 +version=2.2.4.1 category=admin package_macro_name=S6_PORTABLE_UTILS diff --git a/src/skaembutils/s6-uniquename.c b/src/skaembutils/s6-uniquename.c index d9766fe..988179e 100644 --- a/src/skaembutils/s6-uniquename.c +++ b/src/skaembutils/s6-uniquename.c @@ -31,10 +31,8 @@ int main (int argc, char const *const *argv) argc -= l.ind ; argv += l.ind ; } if (argc < 1) usage() ; - if (!random_init()) - strerr_diefu1sys(111, "init random generator") ; if (!stralloc_cats(&sa, argv[0])) strerr_diefu1sys(111, "stralloc_cats") ; - if (!(n ? random_sauniquename(&sa, n) : sauniquename(&sa))) + if (!(n ? random_sauniquename_early(&sa, n) : sauniquename(&sa))) strerr_diefu1sys(111, "make unique name") ; if (!stralloc_catb(&sa, "\n", 1)) strerr_diefu1sys(111, "stralloc_cats") ; if (allwrite(1, sa.s, sa.len) < sa.len) strerr_diefu1sys(111, "write to stdout") ; diff --git a/src/skaembutils/s6-update-symlinks.c b/src/skaembutils/s6-update-symlinks.c index 6acb77c..770827e 100644 --- a/src/skaembutils/s6-update-symlinks.c +++ b/src/skaembutils/s6-update-symlinks.c @@ -5,6 +5,7 @@ #include #include #include + #include #include #include @@ -292,8 +293,6 @@ int main (int argc, char *const *argv) while (i && (argv[1][i-1] == '/')) argv[1][--i] = 0 ; if (!i) strerr_diefu1x(100, "replace root directory") ; } - if (!random_init()) - strerr_diefu1sys(111, "init random generator") ; if (!makeuniquename(&blah.dst, argv[1], MAGICNEW)) strerr_diefu2sys(111, "make random unique name based on ", argv[1]) ; if ((unlink(blah.dst.s) == -1) && (errno != ENOENT)) -- cgit v1.2.3