diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2024-10-05 12:50:10 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2024-10-05 12:50:10 +0000 |
| commit | 3faee810784ad58448f84c918f9059a9a131549a (patch) | |
| tree | 0dec860b446ab795c9a58eb1c46a6688af7427aa | |
| parent | a829eea15d97899686d48bfe9801bd7832b0bc07 (diff) | |
| download | lh-bootstrap-3faee810784ad58448f84c918f9059a9a131549a.tar.xz | |
Upgrade skaware to latest commits; add dnsfunnel and apaste
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | sub/skarnet.org/Makefile | 74 |
1 files changed, 44 insertions, 30 deletions
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index b47112a..41f4a1a 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -1,50 +1,56 @@ -SKALIBS_VERSION := 4dcf9fa0521a1c4243c28fb2f657d8029317e55e -# SKALIBS_VERSION := v2.14.2.0 +SKALIBS_VERSION := 18290598b001146c684d5b67762007fee0182071 +# SKALIBS_VERSION := v2.14.3.0 -# NSSS_VERSION := f682481f7b44352871fe52809c0924bd09e94758 -NSSS_VERSION := v0.2.0.4 +NSSS_VERSION := 058cb099026db5839fb62da38570a9066fc3e280 +# NSSS_VERSION := v0.2.0.5 -# UTMPS_VERSION := 81ca09312ff77b9cedfb58ef25ab9b09160d6700 +# UTMPS_VERSION := bb5f31c4d294f26cd3d4d03bd540f0dd0526b810 UTMPS_VERSION := v0.1.2.2 -EXECLINE_VERSION := 9983edf33b1eb4d91bf1187f8e4b7c0c3d288e53 -# EXECLINE_VERSION := v2.9.6.0 +EXECLINE_VERSION := 7966e2038925e3be60e82402673dcf080b6b3a89 +# EXECLINE_VERSION := v2.9.6.1 -S6_VERSION := 9778ca30e4415698dbb1f736cf5fe132a7cec04d -# S6_VERSION := v2.13.0.0 +S6_VERSION := 83af5922365b2c6e9decc7c8d6168deb76994e85 +# S6_VERSION := v2.13.1.0 -S6_RC_VERSION := f3a8a60eb872096084c98ccaabf65656df349998 -# S6_RC_VERSION := v0.5.4.3 +S6_RC_VERSION := 7ea129564e5df90963fe0d3302dd3244050fa3af +# S6_RC_VERSION := v0.5.5.0 -# S6_LINUX_INIT_VERSION := 28787fc0512f8df17809c1a0507da2bfed552082 -S6_LINUX_INIT_VERSION := v1.1.2.0 +S6_LINUX_INIT_VERSION := 69f6e33e931e0302c94ceea83c691644d64a943d +# S6_LINUX_INIT_VERSION := v1.1.2.1 -# S6_PORTABLE_UTILS_VERSION := 00ad09ecf7ad44e32c3cc54819bbf50e944fd4f9 -S6_PORTABLE_UTILS_VERSION := v2.3.0.3 +S6_PORTABLE_UTILS_VERSION := 133a98cfccabd660afe2d59c142e0f83ebd88b28 +# S6_PORTABLE_UTILS_VERSION := v2.3.0.4 -# S6_LINUX_UTILS_VERSION := 4ac235b523cd1b50bd681e31c8241a2b8bdd3060 -S6_LINUX_UTILS_VERSION := v2.6.2.0 +S6_LINUX_UTILS_VERSION := 8de20625f671a4c45abfc46821651476cf6d5fe6 +# S6_LINUX_UTILS_VERSION := v2.6.2.1 -S6_DNS_VERSION := 33e4b9d9137b5dbb02a087956f1558ef30647aea -# S6_DNS_VERSION := v2.3.7.2 +S6_DNS_VERSION := 0d15ddfe8aaa1faf94a3734091c70739fcbb28e4 +# S6_DNS_VERSION := v2.3.8.0 -S6_NETWORKING_VERSION := 42cb4c7b043964874caea0268b6c814e68a6e7a5 -# S6_NETWORKING_VERSION := v2.7.0.3 +S6_NETWORKING_VERSION := f7965cf9e2f22d94b33aec470479f31cedc2e4f8 +# S6_NETWORKING_VERSION := v2.7.0.4 -MDEVD_VERSION := 937ddb0570d2460120f557a6596e31a739344413 -# MDEVD_VERSION := v0.1.6.4 +MDEVD_VERSION := 80460c48ad1553dcb3396a70ccd86e9194371277 +# MDEVD_VERSION := v0.1.6.5 -TIPIDEE_VERSION := e57d75a58a486e797c574a7a8358d161f9a28f76 -# TIPIDEE_VERSION := v0.0.5.0 +TIPIDEE_VERSION := 9cbb088ed47e72665efd40c9cabef37be77edd40 +# TIPIDEE_VERSION := v0.0.5.1 -SHIBARI_VERSION := eafeae3861b5fc875c3f9c6aab48fcd7e882da8c -# SHIBARI_VERSION := v0.0.1.1 +SHIBARI_VERSION := 6fbe5f610abf1dada9f94672643d5fc6c01d4cfc +# SHIBARI_VERSION := v0.0.1.2 -# BCNM_VERSION := 3d9b9a04a3d1acc82be9c27bb2346473c1fe7f3f -BCNM_VERSION := v0.0.1.7 +BCNM_VERSION := 16107f18da64ac348026b8bfcf3ed39e9ff5d558 +# BCNM_VERSION := v0.0.1.8 -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_VERSION := ff4f1c3e5bdee68fe0baebd55b9b55e7e9b99e5a +# DNSFUNNEL_VERSION := v0.0.2.0 + +APASTE_VERSION := 9456f992cc1f9afc221c61ad9010d9c9eddfa240 +# APASTE_VERSION := v0.0.2.1 + +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 SKAWARE_BUILD := SKALIBS NSSS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS SKALIBS_DEPENDENCIES := @@ -62,6 +68,8 @@ MDEVD_DEPENDENCIES := SKALIBS NSSS TIPIDEE_DEPENDENCIES := SKALIBS SHIBARI_DEPENDENCIES := SKALIBS S6 S6_DNS BCNM_DEPENDENCIES := SKALIBS +DNSFUNNEL_DEPENDENCIES := SKALIBS S6_DNS +APASTE_DEPENDENCIES := SKALIBS SKALIBS_CATEGORY := prog NSSS_CATEGORY := admin @@ -78,6 +86,8 @@ MDEVD_CATEGORY := admin TIPIDEE_CATEGORY := web SHIBARI_CATEGORY := web BCNM_CATEGORY := admin +DNSFUNNEL_CATEGORY := web +APASTE_CATEGORY := admin SKALIBS_TOKEN := libskarnet.a.xyzzy NSSS_TOKEN := nsssd-unix @@ -94,6 +104,8 @@ MDEVD_TOKEN := mdevd TIPIDEE_TOKEN := tipideed SHIBARI_TOKEN := shibari-server-udp BCNM_TOKEN := bcnm-waitif +DNSFUNNEL_TOKEN := dnsfunneld +APASTE_TOKEN := apaste SKAWARE_ENV := $(if $(filter true,$(TARGET_STATIC)),,env LDFLAGS=-Wl,-rpath-link,$(OUTPUT)/rootfs/library.so) SKAWARE_OPTIONS := --enable-slashpackage --enable-nsss $(if $(filter true,$(TARGET_STATIC)),--enable-static-libc --disable-shared,--enable-shared --disable-allstatic) @@ -113,6 +125,8 @@ MDEVD_OPTIONS := TIPIDEE_OPTIONS := SHIBARI_OPTIONS := BCNM_OPTIONS := +DNSFUNNEL_OPTIONS := +APASTE_OPTIONS := $(OUTPUT)/build-$(TRIPLE)/s6-networking-$(S6_NETWORKING_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed |