From 6696cee3bd309f61fc6c945ef747262a845e9267 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 10 Aug 2021 18:24:46 +0000 Subject: Prepare for 1.0.6.4, adapt to skalibs-2.11.0.0 Signed-off-by: Laurent Bercot --- CONTRIBUTING | 5 +++++ DCO | 37 ++++++++++++++++++++++++++++++++++ INSTALL | 10 ++++----- NEWS | 6 ++++++ doc/index.html | 16 +++++++-------- doc/upgrade.html | 15 ++++++++++++++ package/info | 2 +- src/init/s6-linux-init-maker.c | 8 ++++---- src/init/s6-linux-init-telinit.c | 2 +- src/init/s6-linux-init.c | 2 +- src/misc/s6-linux-init-echo.c | 2 +- src/shutdown/hpr.h | 2 +- src/shutdown/hpr_shutdown.c | 2 +- src/shutdown/s6-linux-init-hpr.c | 2 +- src/shutdown/s6-linux-init-shutdown.c | 16 +++++++-------- src/shutdown/s6-linux-init-shutdownd.c | 14 ++++++------- 16 files changed, 102 insertions(+), 39 deletions(-) create mode 100644 CONTRIBUTING create mode 100644 DCO diff --git a/CONTRIBUTING b/CONTRIBUTING new file mode 100644 index 0000000..6279422 --- /dev/null +++ b/CONTRIBUTING @@ -0,0 +1,5 @@ + Please add a Signed-Off-By: line at the end of your commit, +which certifies that you have the right and authority to pass +it on as an open-source patch, as explicited in the Developer's +Certificate of Origin available in this project's DCO file, +or at https://developercertificate.org/ diff --git a/DCO b/DCO new file mode 100644 index 0000000..8201f99 --- /dev/null +++ b/DCO @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/INSTALL b/INSTALL index ec61830..f78c0d1 100644 --- a/INSTALL +++ b/INSTALL @@ -6,11 +6,11 @@ Build Instructions - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.10.0.3 or later: https://skarnet.org/software/skalibs/ - - Optional: nsss version 0.1.0.1 or later: https://skarnet.org/software/nsss/ - - Optional: utmps version 0.1.0.2 or later: https://skarnet.org/software/utmps/ - - execline version 2.8.0.1 or later: https://skarnet.org/software/execline/ - - s6 version 2.10.0.3 or later: https://skarnet.org/software/s6/ + - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/ + - Optional: nsss version 0.1.0.2 or later: https://skarnet.org/software/nsss/ + - Optional: utmps version 0.1.0.3 or later: https://skarnet.org/software/utmps/ + - execline version 2.8.1.0 or later: https://skarnet.org/software/execline/ + - s6 version 2.11.0.0 or later: https://skarnet.org/software/s6/ This software is Linux-specific. It will run on a Linux kernel, version 2.6.32 or later. However, it should not be too hard to port to diff --git a/NEWS b/NEWS index 6648bc9..5fc2a6a 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-linux-init. +In 1.0.6.4 +---------- + + - Adapt to skalibs-2.11.0.0. + + In 1.0.6.3 ---------- diff --git a/doc/index.html b/doc/index.html index f5e78c4..b6ee197 100644 --- a/doc/index.html +++ b/doc/index.html @@ -73,16 +73,16 @@ kernel command line
  • A Linux-based system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.10.0.3 or later. It's a build-time requirement. It's also a run-time +2.11.0.0 or later. It's a build-time requirement. It's also a run-time requirement (for s6-linux-init-maker) as well as a boot-time requirement (i.e. a run-time requirement for the programs used when you boot a system created with s6-linux-init-maker) if you link against the shared version of the skalibs library.
  • execline version -2.8.0.1 or later. It is a build-time and boot-time requirement.
    • +2.8.1.0 or later. It is a build-time and boot-time requirement.
  • s6 version -2.10.0.3 or later. It is a build-time and boot-time requirement.
    • +2.11.0.0 or later. It is a build-time and boot-time requirement.

    @@ -93,10 +93,10 @@ against the shared version of the skalibs library.

  • If you're using musl and want nsswitch-like functionality: nsss version -0.1.0.1 or later (build-time and boot-time)
    • +0.1.0.2 or later (build-time and boot-time)
  • If you want secure utmp functionality: utmps version -0.1.0.2 or later (build-time and boot-time)
    • +0.1.0.3 or later (build-time and boot-time)

    @@ -116,7 +116,7 @@ all the other packages against the static version of libskarnet.