From 76a04a720f7c5a366b88fe2b1727e47103ee796c Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 10 Aug 2021 17:56:42 +0000 Subject: Prepare for 2.5.1.6 ; adapt to skalibs-2.11.0.0 Signed-off-by: Laurent Bercot --- CONTRIBUTING | 5 +++++ DCO | 37 +++++++++++++++++++++++++++++++++++++ INSTALL | 2 +- NEWS | 6 ++++++ doc/index.html | 2 +- doc/upgrade.html | 7 +++++++ package/info | 2 +- src/minutils/s6-logwatch.c | 4 ++-- src/minutils/s6-mount.c | 2 +- src/minutils/s6-ps.c | 2 +- src/minutils/s6-ps.h | 6 +++--- src/minutils/s6ps_pfield.c | 14 +++++++------- src/minutils/s6ps_statparse.c | 6 +++--- 13 files changed, 75 insertions(+), 20 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 ce985ef..ee445fa 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ 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/ + - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/ This software is Linux-specific. It will run on a Linux kernel, version 3.5 or later. diff --git a/NEWS b/NEWS index aa591b1..e1917d2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-linux-utils. +In 2.5.1.6 +---------- + + - Adaptation to skalibs-2.11.0.0. + + In 2.5.1.5 ---------- diff --git a/doc/index.html b/doc/index.html index 9f3cece..80d3fcd 100644 --- a/doc/index.html +++ b/doc/index.html @@ -117,7 +117,7 @@ the previous versions of s6-linux-utils and the current one.

Similar work

diff --git a/doc/upgrade.html b/doc/upgrade.html index 9ddde71..2f6d15a 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,13 @@

What has changed in s6-linux-utils

+

in 2.5.1.6

+ + +

in 2.5.1.5