Update skaware to latest versions, add smtpd-starttls-proxy

1 files changed, 44 insertions, 37 deletions

diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index f94ab4e..d7dc660 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -1,59 +1,62 @@
 
-# SKALIBS_VERSION := 4f9abc77dfe3046477cdcf6da4b487fc6c318b2a
-SKALIBS_VERSION := v2.14.5.1
+SKALIBS_VERSION := 8fe66dd5967bf8b809c7c8d5bd56145fe3fa19c5
+# SKALIBS_VERSION := v2.15.0.0
 
-# NSSS_VERSION := 9505a88682b9dbbdf4e6afd60cde94e5be197886
-NSSS_VERSION := v0.2.1.1
+NSSS_VERSION := a50d1d5c4a774efabbb0ae5f5aff5a0bfea2230a
+# NSSS_VERSION := v0.2.1.2
 
-# UTMPS_VERSION := c79ac86f0c819340d4a56b2151fb4808b6356d7f
-UTMPS_VERSION := v0.1.3.2
+UTMPS_VERSION := 50fdcf41bed384f6460d4c60152cc67afee41cc8
+# UTMPS_VERSION := v0.1.3.2
 
-# EXECLINE_VERSION := bf34a2087af1f90cfa004a552c967b2e5382ca59
-EXECLINE_VERSION := v2.9.8.1
+EXECLINE_VERSION := 724d0a049f46f68f24d3eca6c7975d12d37d6062
+# EXECLINE_VERSION := v2.9.9.0
 
-# S6_VERSION := c610b21bc606ae4a56c48c671b1d015b35ce3303
-S6_VERSION := v2.14.0.1
+S6_VERSION := f97cc3fd85a231c84b29a729436849f4f5eaff4f
+# S6_VERSION := v2.15.0.0
 
-# S6_RC_VERSION := 3c61b2916c56bfa8d3ce7a6a5480eb93c2ed1470
-S6_RC_VERSION := v0.6.0.0
+S6_RC_VERSION := 6b157ce56d865d2c2a61d02cfac6f16acc45b7a1
+# S6_RC_VERSION := v0.6.1.0
 
-# S6_LINUX_INIT_VERSION := 87808c2c12a93e46b9bc4ef0ac992e70c9e5e1b9
-S6_LINUX_INIT_VERSION := v1.2.0.0
+S6_LINUX_INIT_VERSION := 43394581bb3106633c8802b378a7f2e6e53b352a
+# S6_LINUX_INIT_VERSION := v1.2.0.1
 
-# S6_FRONTEND_VERSION := 36a6201335c467a6c7368ba6598c90702b39ee62
-S6_FRONTEND_VERSION := v0.0.1.0
+S6_FRONTEND_VERSION := ca9e764c7187c673776683d439dcb545971fcfa8
+# S6_FRONTEND_VERSION := v0.0.1.2
 
-# S6_PORTABLE_UTILS_VERSION := 93f521eb8c444dea0ae297e9f961a950c93d9575
-S6_PORTABLE_UTILS_VERSION := v2.3.1.1
+S6_PORTABLE_UTILS_VERSION := 00b2ea3fb412d90daa4939b27f6498c86d93b4b7
+# S6_PORTABLE_UTILS_VERSION := v2.3.1.2
 
-# S6_LINUX_UTILS_VERSION := 6623b6180743596f083e21d319b42f8456975a1d
-S6_LINUX_UTILS_VERSION := v2.6.4.0
+S6_LINUX_UTILS_VERSION := 347244ef78f6d6779c28a351f5cf2673dd248e2c
+# S6_LINUX_UTILS_VERSION := v2.6.4.1
 
-# S6_DNS_VERSION := 8b27fed89fe3607e0bbfb86f93c51888deade6e7
-S6_DNS_VERSION := v2.4.1.1
+S6_DNS_VERSION := e6c32e20b78b910fea7f08de9549c77f481d8850
+# S6_DNS_VERSION := v2.4.1.2
 
-# S6_NETWORKING_VERSION := e38ccbf6fe441c41410fc9e03f71dd88f7ce1a15
-S6_NETWORKING_VERSION := v2.7.2.1
+S6_NETWORKING_VERSION := 690a9a27a515ea56f613a9ae2baa9b237daf4f91
+# S6_NETWORKING_VERSION := v2.8.0.0
 
-# MDEVD_VERSION := 0fad70221cbeca03bfc650462a1cd6f18e693611
-MDEVD_VERSION := v0.1.8.1
+MDEVD_VERSION := 99eb59ce50fca5081ddb145ebe34f7c15568b0f0
+# MDEVD_VERSION := v0.1.8.2
 
-# TIPIDEE_VERSION := 6656fd85d41e7eca300ec76d8563de267be34af2
-TIPIDEE_VERSION := v0.0.7.1
+SMTPD_STARTTLS_PROXY_VERSION := 13676f2923406d70489a28d8decf59cbd903e8ea
+# SMTPD_STARTTLS_PROXY_VERSION := v0.1.0.0
 
-# SHIBARI_VERSION := 209cca0b20e4e4a74bab8378502cd3028d8afa51
-SHIBARI_VERSION := v0.0.2.1
+TIPIDEE_VERSION := 371a1436391c6073fa2fa9aecdf095f939f6c45a
+# TIPIDEE_VERSION := v0.0.7.2
 
-# BCNM_VERSION := fad1291d004397261db645293e9a45676015b863
-BCNM_VERSION := v0.0.2.1
+SHIBARI_VERSION := 2c61a23e1685dff2c9dfab099735b90551ec9fb4
+# SHIBARI_VERSION := v0.0.2.2
 
-# DNSFUNNEL_VERSION := 51030e93f82f02418e3dabca6afea37b14cac36a
-DNSFUNNEL_VERSION := v0.0.3.1
+BCNM_VERSION := 7689d2ca2a788ca09abd94504aad7d9aa27d5f49
+# BCNM_VERSION := v0.0.2.2
 
-# APASTE_VERSION := b829fb79265869563408e97dcd45049112824fad
-APASTE_VERSION := v0.0.3.1
+DNSFUNNEL_VERSION := b819bbb95cb92a7942e37e774c1d8511dc4f5b1c
+# DNSFUNNEL_VERSION := v0.0.3.2
 
-SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD TIPIDEE SHIBARI BCNM DNSFUNNEL APASTE S6_FRONTEND
+APASTE_VERSION := e30394542980983b75ecd7ff9a0cf88215bf5dbe
+# APASTE_VERSION := v0.0.3.2
+
+SKAWARE := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD SMTPD_STARTTLS_PROXY TIPIDEE SHIBARI BCNM DNSFUNNEL APASTE S6_FRONTEND
 SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS
 
 SKALIBS_DEPENDENCIES :=
@@ -69,6 +72,7 @@ S6_LINUX_UTILS_DEPENDENCIES := SKALIBS NSSS EXECLINE
 S6_DNS_DEPENDENCIES := SKALIBS
 S6_NETWORKING_DEPENDENCIES := SKALIBS NSSS EXECLINE S6 S6_DNS
 MDEVD_DEPENDENCIES := SKALIBS NSSS
+SMTPD_STARTTLS_PROXY_DEPENDENCIES := SKALIBS S6_NETWORKING
 TIPIDEE_DEPENDENCIES := SKALIBS
 SHIBARI_DEPENDENCIES := SKALIBS S6 S6_DNS
 BCNM_DEPENDENCIES := SKALIBS
@@ -88,6 +92,7 @@ S6_LINUX_UTILS_CATEGORY := admin
 S6_DNS_CATEGORY := web
 S6_NETWORKING_CATEGORY := net
 MDEVD_CATEGORY := admin
+SMTPD_STARTTLS_PROXY_CATEGORY := mail
 TIPIDEE_CATEGORY := web
 SHIBARI_CATEGORY := web
 BCNM_CATEGORY := admin
@@ -107,6 +112,7 @@ S6_LINUX_UTILS_TOKEN := s6-linux-utils
 S6_DNS_TOKEN := s6-dnsip
 S6_NETWORKING_TOKEN := s6-tlsd-io
 MDEVD_TOKEN := mdevd
+SMTPD_STARTTLS_PROXY_TOKEN := smtpd-starttls-proxy-io
 TIPIDEE_TOKEN := tipideed
 SHIBARI_TOKEN := shibari-server-udp
 BCNM_TOKEN := bcnm-waitif
@@ -129,6 +135,7 @@ S6_LINUX_UTILS_OPTIONS := --enable-multicall
 S6_DNS_OPTIONS :=
 S6_NETWORKING_OPTIONS := --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl
 MDEVD_OPTIONS :=
+SMTPD_STARTTLS_PROXY_OPTIONS :=
 TIPIDEE_OPTIONS :=
 SHIBARI_OPTIONS :=
 BCNM_OPTIONS :=