Prepare for 3.1.3.0; change s6-test to eltest

Signed-off-by: Laurent Bercot <[email protected]>

README.md

@@ -41,7 +41,7 @@ Build the following Dockerfile and try it out:
 ```
 # Use your favorite image
 FROM ubuntu
-ARG S6_OVERLAY_VERSION=3.1.2.1
+ARG S6_OVERLAY_VERSION=3.1.3.0
 
 RUN apt-get update && apt-get install -y nginx xz-utils
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
@@ -210,9 +210,9 @@ To install those tarballs, add lines to your Dockerfile that correspond
 to the functionality you want to install. For instance, most people would
 use the following:
 ```
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.3.0/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-x86_64.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.3.0/s6-overlay-x86_64.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 ```
 
@@ -249,9 +249,9 @@ For example:
 
 ```
 FROM busybox
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.3.0/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-x86_64.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.3.0/s6-overlay-x86_64.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 ENTRYPOINT ["/init"]
 ```

conf/defaults.mk

@@ -3,7 +3,7 @@
 # e.g.: make SHEBANGDIR=/usr/bin VERSION=3.1.1.0
 
 # The version of the software being built.
-VERSION := 3.1.2.1
+VERSION := 3.1.3.0
 
 # Where stuff is going to be built. Change for out-of-tree builds.
 OUTPUT := output
@@ -21,7 +21,7 @@ TOOLCHAIN_PATH :=
 
 # When fetching one from the web, what version we want.
 # Only a few versions are available, don't change blindly.
-TOOLCHAIN_VERSION := 12.1.0
+TOOLCHAIN_VERSION := 12.2.0
 
 # For fetching toolchains: the download command.
 # Change to curl -O if you don't have wget.

conf/versions

@@ -3,35 +3,35 @@
 # These version numbers are either git commit hashes or git tags.
 # Try to keep to the latest commits.
 
-BEARSSL_VERSION=79b1a9996c094ff593ae50bc4edc1f349f39dd6d
+BEARSSL_VERSION=46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
 # BEARSSL_VERSION=v0.6
 
 # SKALIBS_VERSION=68b3e92df39db7d496ef91054318d5d9facdfd9d
-SKALIBS_VERSION=v2.12.0.1
+SKALIBS_VERSION=v2.13.0.0
 
 # EXECLINE_VERSION=dcb9e554771a2cd1cebca6524ce729bd49fabc32
-EXECLINE_VERSION=v2.9.0.1
+EXECLINE_VERSION=v2.9.1.0
 
 # S6_VERSION=b4070f01c00a07d4f2df6a3ff85eb6f2b1386b84
-S6_VERSION=v2.11.1.2
+S6_VERSION=v2.11.2.0
 
 # S6_RC_VERSION=58f93f6c710cc88acfa721a45efc1f64dfc557df
-S6_RC_VERSION=v0.5.3.2
+S6_RC_VERSION=v0.5.3.3
 
 # S6_LINUX_INIT_VERSION=b5ed0d1ef886d3c12345c22e6e42aa5fca272bb4
-S6_LINUX_INIT_VERSION=v1.0.8.0
+S6_LINUX_INIT_VERSION=v1.0.8.1
 
 # S6_PORTABLE_UTILS_VERSION=a80a1304ff86b8cf493265696d517aea2cf7a703
-S6_PORTABLE_UTILS_VERSION=v2.2.5.0
+S6_PORTABLE_UTILS_VERSION=v2.2.5.1
 
 # S6_LINUX_UTILS_VERSION=d983a8fe0a8efce4fbbf5fc53fc64e796b794fcb
-S6_LINUX_UTILS_VERSION=v2.6.0.0
+S6_LINUX_UTILS_VERSION=v2.6.0.1
 
 # S6_DNS_VERSION=132f199d2e5561b5f9337201c2d991b513894c60
-S6_DNS_VERSION=v2.3.5.4
+S6_DNS_VERSION=v2.3.5.5
 
 # S6_NETWORKING_VERSION=e4a928d539281bb85305d4b23aef6c270f63f9fa
-S6_NETWORKING_VERSION=v2.5.1.1
+S6_NETWORKING_VERSION=v2.5.1.2
 
 # S6_OVERLAY_HELPERS_VERSION=ec2ca4c650928a64de31dbbe589e0be0e452c992
-S6_OVERLAY_HELPERS_VERSION=v0.1.0.0
+S6_OVERLAY_HELPERS_VERSION=v0.1.0.1

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/logutil-newfifo

@@ -8,7 +8,7 @@ multisubstitute
   elgetpositionals -P0
 }
 emptyenv -oP
-if { s6-test ${#} -ge 1 }
+if { eltest ${#} -ge 1 }
 
 if
 {

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/logutil-service

@@ -7,8 +7,8 @@ multisubstitute
   elgetpositionals -P0
 }
 emptyenv -oP
-if { s6-test ${#} -ge 1 }
-ifelse { s6-test -n ${fifo} }
+if { eltest ${#} -ge 1 }
+ifelse { eltest -n ${fifo} }
 {
   redirfd -rnb 0 ${fifo}
   /package/admin/s6-overlay-@VERSION@/libexec/logutil-service-main ${1}

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/with-contenv

@@ -3,7 +3,7 @@
 ifelse
 {
   importas -D 0 S6_KEEP_ENV S6_KEEP_ENV
-  s6-test 0${S6_KEEP_ENV} -eq 0
+  eltest 0${S6_KEEP_ENV} -eq 0
 }
 {
   emptyenv -p

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/with-retries

@@ -14,11 +14,11 @@ multisubstitute
 emptyenv -oP
 forbacktickx -x 0,1 -d"\n" i { s6-seq 0 ${nretries} }
   importas -u i i
-  if { s6-test ${i} -ne ${nretries} }
+  if { eltest ${i} -ne ${nretries} }
   foreground
   {
     s6-maximumtime -t ${timeout}
     $@
   }
   importas -u ? ?
-  if -x 99 { s6-test ${?} -eq 0 }
+  if -x 99 { eltest ${?} -eq 0 }

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.init

@@ -9,7 +9,7 @@ if test -d /run/s6/container_environment ; then
   s6-chmod 0755 /run/s6/container_environment
 fi
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 cv=$((v - 1))
@@ -22,7 +22,7 @@ if hook=`printcontenv S6_STAGE2_HOOK` && test -n "$hook" ; then
   $hook
   r=$?
   set -e
-  if s6-test "$r" -gt 0 -a "$v" -gt 0 ; then
+  if eltest "$r" -gt 0 -a "$v" -gt 0 ; then
     echo "$prog: warning: hook $hook exited $r" 1>&2
   fi
 fi
@@ -36,7 +36,7 @@ fi
 s6-rc-compile -v"$cv" /run/s6/db "$etc/s6-overlay/s6-rc.d" /package/admin/s6-overlay-@VERSION@/etc/s6-rc/sources
 s6-rc-init -c /run/s6/db /run/service
 
-if timeout=`printcontenv S6_CMD_WAIT_FOR_SERVICES_MAXTIME` && s6-test "$timeout" =~ '^[[:digit:]]+$' ; then : ; else
+if timeout=`printcontenv S6_CMD_WAIT_FOR_SERVICES_MAXTIME` && eltest "$timeout" =~ '^[[:digit:]]+$' ; then : ; else
   timeout=5000
 fi
 
@@ -45,7 +45,7 @@ s6-rc -v$v -u -t "$timeout" -- change "$top"
 r=$?
 set -e
 
-if b=`printcontenv S6_BEHAVIOUR_IF_STAGE2_FAILS` && s6-test "$r" -gt 0 -a "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
+if b=`printcontenv S6_BEHAVIOUR_IF_STAGE2_FAILS` && eltest "$r" -gt 0 -a "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
   echo "$prog: warning: s6-rc failed to properly bring all the services up! Check your logs (in /run/uncaught-logs/current if you have in-container logging) for more information." 1>&2
   if test "$b" -ge 2 ; then
     echo "$prog: fatal: stopping the container." 1>&2
@@ -58,7 +58,7 @@ if test "$#" -gt 0 ; then
   cd `s6-cat < /run/s6/workdir`
   set +e
   arg0=`printcontenv S6_CMD_ARG0`
-  if b=`printcontenv S6_CMD_RECEIVE_SIGNALS` && s6-test "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
+  if b=`printcontenv S6_CMD_RECEIVE_SIGNALS` && eltest "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
     $arg0 "$@" &
     cmdpid="$!"
     echo "$cmdpid" > /run/s6/cmdpid

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-linux-init/skel/rc.shutdown

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-rc/scripts/cont-finish

@@ -6,11 +6,11 @@ else
   etc=/etc
 fi
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 
-if kimeout=`printcontenv S6_KILL_FINISH_MAXTIME` && s6-test "$kimeout" =~ '^[[:digit:]]+$' ; then : ; else
+if kimeout=`printcontenv S6_KILL_FINISH_MAXTIME` && eltest "$kimeout" =~ '^[[:digit:]]+$' ; then : ; else
   kimeout=0
 fi
 

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-rc/scripts/cont-init

@@ -8,7 +8,7 @@ else
   etc=/etc
 fi
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-rc/scripts/fix-attrs

@@ -9,7 +9,7 @@ else
   etc=/etc
 fi
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-rc/scripts/services-down

@@ -15,7 +15,7 @@ done
 if test -n "$list" ; then
   s6-rmrf $links
   s6-svscanctl -an /run/service
-  if grace=`printcontenv S6_SERVICES_GRACETIME` && s6-test "$grace" =~ '^[[:digit:]]+$' ; then : ; else
+  if grace=`printcontenv S6_SERVICES_GRACETIME` && eltest "$grace" =~ '^[[:digit:]]+$' ; then : ; else
     grace=3000
   fi
   s6-svwait -D -t "$grace" -- $list

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/etc/s6-rc/scripts/services-up

@@ -6,7 +6,7 @@ else
   etc=/etc
 fi
 
-if v=`printcontenv S6_VERBOSITY` && s6-test "$v" =~ '^[[:digit:]]+$' ; then : ; else
+if v=`printcontenv S6_VERBOSITY` && eltest "$v" =~ '^[[:digit:]]+$' ; then : ; else
   v=2
 fi
 
@@ -44,12 +44,12 @@ done
 
 s6-svscanctl -a /run/service
 
-if dowait=`printcontenv S6_CMD_WAIT_FOR_SERVICES` && s6-test "$dowait" =~ '^[[:digit:]]+$' -a "$dowait" -gt 0 ; then
-  if maxtime=`printcontenv S6_CMD_WAIT_FOR_SERVICES_MAXTIME` && s6-test "$maxtime" =~ '^[[:digit:]]+$' ; then : ; else
+if dowait=`printcontenv S6_CMD_WAIT_FOR_SERVICES` && eltest "$dowait" =~ '^[[:digit:]]+$' -a "$dowait" -gt 0 ; then
+  if maxtime=`printcontenv S6_CMD_WAIT_FOR_SERVICES_MAXTIME` && eltest "$maxtime" =~ '^[[:digit:]]+$' ; then : ; else
     maxtime=0
   fi
 
-  if rtime=`printcontenv S6_SERVICES_READYTIME` && s6-test "$rtime" =~ '^[[:digit:]]+$' ; then : ; else
+  if rtime=`printcontenv S6_SERVICES_READYTIME` && eltest "$rtime" =~ '^[[:digit:]]+$' ; then : ; else
     rtime=50
   fi
 
@@ -63,7 +63,7 @@ if dowait=`printcontenv S6_CMD_WAIT_FOR_SERVICES` && s6-test "$dowait" =~ '^[[:d
   if test -n "$notifyes" && ! s6-svwait -U -t "$maxtime" -- $notifyes ; then
     r=true
   fi
-  if $r && b=`printcontenv S6_BEHAVIOUR_IF_STAGE2_FAILS` && s6-test "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
+  if $r && b=`printcontenv S6_BEHAVIOUR_IF_STAGE2_FAILS` && eltest "$b" =~ '^[[:digit:]]+$' -a "$b" -gt 0 ; then
     if test $v -ge 1 ; then
       echo 'services-up: warning: some legacy longruns failed to start' 1>&2
     fi