Browse Source

Update to latest versions

Signed-off-by: Laurent Bercot <[email protected]>
Laurent Bercot 5 months ago
parent
commit
622384e0fd
4 changed files with 24 additions and 24 deletions
  1. 1 1
      README.md
  2. 2 2
      conf/defaults.mk
  3. 20 20
      conf/versions
  4. 1 1
      mk/skaware.mk

+ 1 - 1
README.md

@@ -961,7 +961,7 @@ RUN cd /tmp && sha256sum -c *.sha256
 
 ### `USER` directive
 
-As of version 3.2.0.2, s6-overlay has limited support for running as a user other than `root`:
+As of version 3.2.0.3, s6-overlay has limited support for running as a user other than `root`:
 
 * Tools like `fix-attrs` and `logutil-service` are unlikely to work (they rely
   on being able to change UIDs).

+ 2 - 2
conf/defaults.mk

@@ -1,9 +1,9 @@
 # This file normally shouldn't be changed; the values can be
 # overridden by invoking make with arguments.
-# e.g.: make SHEBANGDIR=/usr/bin VERSION=3.1.6.0
+# e.g.: make SHEBANGDIR=/usr/bin VERSION=3.2.0.3
 
 # The version of the software being built.
-VERSION := 3.2.0.2
+VERSION := 3.2.0.3
 
 # Where stuff is going to be built. Change for out-of-tree builds.
 OUTPUT := output

+ 20 - 20
conf/versions

@@ -6,32 +6,32 @@
 BEARSSL_VERSION=3c040368f6791553610e362401db1efff4b4c5b8
 # BEARSSL_VERSION=v0.6
 
-# SKALIBS_VERSION=18290598b001146c684d5b67762007fee0182071
-SKALIBS_VERSION=v2.14.3.0
+SKALIBS_VERSION=6b8878ed9df46954d49d82bcc091c02a6a1a349e
+# SKALIBS_VERSION=v2.14.4.0
 
-# EXECLINE_VERSION=7966e2038925e3be60e82402673dcf080b6b3a89
-EXECLINE_VERSION=v2.9.6.1
+EXECLINE_VERSION=b9eb768dc8a61251a0c39fb3845d898338892587
+# EXECLINE_VERSION=v2.9.7.0
 
-# S6_VERSION=83af5922365b2c6e9decc7c8d6168deb76994e85
-S6_VERSION=v2.13.1.0
+S6_VERSION=07a793bc3b40d690da98dbf4436ac4503061e0fe
+# S6_VERSION=v2.13.2.0
 
-# S6_RC_VERSION=7ea129564e5df90963fe0d3302dd3244050fa3af
-S6_RC_VERSION=v0.5.5.0
+S6_RC_VERSION=09ccd3128f2296d3a0cd1602e64caf06cf22c64f
+# S6_RC_VERSION=v0.5.6.0
 
-# S6_LINUX_INIT_VERSION=69f6e33e931e0302c94ceea83c691644d64a943d
-S6_LINUX_INIT_VERSION=v1.1.2.1
+S6_LINUX_INIT_VERSION=445c07024609de545795e16035a4a1ab12586561
+# S6_LINUX_INIT_VERSION=v1.1.3.0
 
-# S6_PORTABLE_UTILS_VERSION=133a98cfccabd660afe2d59c142e0f83ebd88b28
-S6_PORTABLE_UTILS_VERSION=v2.3.0.4
+S6_PORTABLE_UTILS_VERSION=bc7c571125e245bb5a08578e3b31752fc7335460
+# S6_PORTABLE_UTILS_VERSION=v2.3.1.0
 
-# S6_LINUX_UTILS_VERSION=8de20625f671a4c45abfc46821651476cf6d5fe6
-S6_LINUX_UTILS_VERSION=v2.6.2.1
+S6_LINUX_UTILS_VERSION=7cdb6a63f20f1abc96738ebf7b97effcae5bfd4b
+# S6_LINUX_UTILS_VERSION=v2.6.3.0
 
-# S6_DNS_VERSION=0d15ddfe8aaa1faf94a3734091c70739fcbb28e4
-S6_DNS_VERSION=v2.4.0.0
+S6_DNS_VERSION=2f3ccc92df447cc5705e6013e61c1e4bd75d393e
+# S6_DNS_VERSION=v2.4.1.0
 
-# S6_NETWORKING_VERSION=f7965cf9e2f22d94b33aec470479f31cedc2e4f8
-S6_NETWORKING_VERSION=v2.7.0.4
+S6_NETWORKING_VERSION=70eaae07db27291d918aaf84f1c08bc0ac744534
+# S6_NETWORKING_VERSION=v2.7.1.0
 
-# S6_OVERLAY_HELPERS_VERSION=a6281ad45dd43f4e8ddb6818a9b0513e391e64bb
-S6_OVERLAY_HELPERS_VERSION=v0.1.1.0
+S6_OVERLAY_HELPERS_VERSION=3c3f6c5d1eea6454df2ecbcfca00cefe3453703f
+# S6_OVERLAY_HELPERS_VERSION=v0.1.2.0

+ 1 - 1
mk/skaware.mk

@@ -34,7 +34,7 @@ S6_NETWORKING_TOKEN := s6-tlsd-io
 S6_OVERLAY_HELPERS_TOKEN := s6-overlay-suexec
 
 SKAWARE_OPTIONS := --enable-slashpackage --enable-static-libc --disable-shared
-SKALIBS_OPTIONS := --with-default-path=/command:/usr/bin:/bin --with-sysdep-devurandom=yes --with-sysdep-grndinsecure=no --with-sysdep-posixspawnearlyreturn=no
+SKALIBS_OPTIONS := --with-default-path=/command:/usr/bin:/bin --with-sysdep-devurandom=yes --with-sysdep-grndinsecure=no --with-sysdep-posixspawnearlyreturn=no --with-sysdep-procselfexe=/proc/self/exe
 EXECLINE_OPTIONS := --disable-pedantic-posix --enable-multicall
 S6_OPTIONS :=
 S6_RC_OPTIONS :=