commit 6f6e104045b42d5ed1227ce0e5e897bd064b49a4
parent 871849f0a2bc26fec6d55815e796dfe7a07f086a
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Thu, 22 Feb 2024 14:20:14 +0100
Enable libretls/openssl in s6-networking and rsync
Diffstat:
22 files changed, 67 insertions(+), 91 deletions(-)
diff --git a/packages/containers b/packages/containers
@@ -2,7 +2,7 @@
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
: ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -1,13 +1,13 @@
#!/usr/bin/env pthbs-build
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
-#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
-#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
-#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
-
-s6rcdb=/home/ccx/versions/core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1/s6-rc-db
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
+#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
+#+s6-portable-utils.006eb4148474403811d37658a8af4f304d4f3018d0df8459030dc7a557a13588
+#+s6-linux-init.2c3c03a7e8ac0115768554a7959984f01be8283c02d0b38208ee17839fa8fe25
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c
+
+s6rcdb=/home/ccx/versions/core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
-#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
+#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
#+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
diff --git a/packages/default.environment b/packages/default.environment
@@ -5,27 +5,27 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.d1081a8cdc5cf10f9f52d038fc451b615ffb282b8959b1840481b12240d97601
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
-#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
-#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
-#+s6-linux-utils.2df7505b7f9bf745c5d27eced90a85afb83f43e055e64e6f243e5831d3800db1
-#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
-#+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
-#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
-#+libressl.31704cc96ed1bf7e685eda0046d8191f4352118d164d973b727c145b80e8571c
-#+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
+#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
+#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
+#+s6-portable-utils.006eb4148474403811d37658a8af4f304d4f3018d0df8459030dc7a557a13588
+#+s6-linux-utils.22a42de16726d1239f767300c14b199af7548543cbf83248b8ce63a8802d6042
+#+s6-linux-init.2c3c03a7e8ac0115768554a7959984f01be8283c02d0b38208ee17839fa8fe25
+#+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
+#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
+#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
+#+s6-networking.e7ad51c3d91b34bdf1945116b64655c4787e66e54931b7eb5cdf2daeafccacc6
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
#+confz.22f90e5b155ace65fd78ebe7f4c12d6ae9ddc3af14c51ddb99f9c47e19d39cdb
-#+containers.de880d8cacbb87b0a30e88654c81e291178ecd2c3717de59e0a64f694a8da8b8
+#+containers.4ab3e9e798fbdc13aeb84ff63edf12809cec8b239742247d703e44930969da26
#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
-#+logincaps.0296b3435c8943a4138dbe4ccbb27d29cee31f1437c74b4c45218fb77873b10a
+#+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3
#+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
#+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
-#+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
+#+core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c
#+core-system-scripts.a6948d0ca8f36e41bf5f0ec5acc13bc2fc6c9787282984ff089482ee5c587a9d
-#+core-system-init.c55889e425a8c194b5a6954cd9345290f68caacbdbfff152b79eb7eff67607b1
-#+linux.242228889e1f87a5e3173cdddfc6b8973404289b1210052f18afb1c3e5920a18-
\ No newline at end of file
+#+core-system-init.ee01d7c8fb94d813161d6db6d89a33f14955f3066a925a00c1cb330f83c9d5a5
+#+linux.9529e17e85bee1927f947b7275d9fdff0e5dfd1952418b2eff589b39e7e22684+
\ No newline at end of file
diff --git a/packages/execline b/packages/execline
@@ -6,11 +6,9 @@
#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 'execline'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/libressl b/packages/libressl
@@ -74,6 +74,7 @@ BEGIN {
x["./command/openssl"]=1
x["./command/ocspcheck"]=1
x["./man/man1/openssl.1"]=1
+ x["./library/libssl.a"]=1
}
function r1(s) {
diff --git a/packages/linux b/packages/linux
@@ -6,7 +6,7 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.d1081a8cdc5cf10f9f52d038fc451b615ffb282b8959b1840481b12240d97601
+#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
#+libelf-compat.3023655d655211fc0f061928c09b8b5374a966ea08fd54ac43ff7876a7a73f5b
#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
#@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
diff --git a/packages/logincaps b/packages/logincaps
@@ -2,7 +2,7 @@
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
#@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
diff --git a/packages/mdevd b/packages/mdevd
@@ -3,15 +3,13 @@
#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 'mdevd'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/rsync b/packages/rsync
@@ -5,6 +5,7 @@
#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
#+popt.adfcea1cb6aed424e16f20b3f3579c7332129f040d0110c68e301688ff4d66a7
+#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
autotools() {
@@ -65,7 +66,7 @@ check_static() {
autotools_static rsync-3.2.7 \
--disable-nls \
--without-included-popt \
- --disable-openssl \
+ --enable-openssl \
--disable-xxhash \
--disable-zstd \
--disable-lz4
diff --git a/packages/s6 b/packages/s6
@@ -4,7 +4,7 @@
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
#@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -6,11 +6,9 @@
#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-dns'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -3,16 +3,14 @@
#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
#@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-linux-init'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -6,11 +6,9 @@
#@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-linux-utils'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -3,17 +3,15 @@
#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
-#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
+#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-networking'
-
-./configure \
+./configure --enable-ssl=libtls \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -6,11 +6,9 @@
#@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-portable-utils'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -3,16 +3,14 @@
#+gnu-make.1d42a93ec73db6119517d6554dbd49317209dc527295acb4ea8e804be913b9a3
#+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
#+skalibs.7da227e5fb2fe77ecec2f3ff1e9c199240cfa9a55db55c45e228d21816f6bfbf
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
: ${JOBS:=1}
-
prefix=/home/ccx/versions/$pthbs_package
cd 's6-rc'
-
-./configure \
+./configure \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -5,22 +5,22 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.d1081a8cdc5cf10f9f52d038fc451b615ffb282b8959b1840481b12240d97601
-#+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
-#+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
-#+s6-rc.fa58d1bfe37ddff7b914b02f437603591be6eeb24504bdfb1ef9b9cfd5a7fec1
-#+s6-portable-utils.b65c44afe259065e02ca9a16cea0a632af2dab831056abd1a50248f4b95d078f
-#+s6-linux-utils.2df7505b7f9bf745c5d27eced90a85afb83f43e055e64e6f243e5831d3800db1
-#+s6-linux-init.163646f3a337341ddb9ce39a5fc8afbd3507c0c3c94bc8f4d0458c0cee753448
-#+mdevd.1ccacf0514eeffea88fc8203b470398b95638632eae38f1048a6f3bf5754f6dd
-#+s6-dns.41e9bc09d7f62576c34aad13f3e57168c5052ec4674abbbb9d2ccf78ee0db6e0
-#+libressl.31704cc96ed1bf7e685eda0046d8191f4352118d164d973b727c145b80e8571c
-#+s6-networking.15adf950be6728a030816bedd5b2283e78e41796cea59b614b22c44690dfd6fa
+#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
+#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
+#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
+#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
+#+s6-portable-utils.006eb4148474403811d37658a8af4f304d4f3018d0df8459030dc7a557a13588
+#+s6-linux-utils.22a42de16726d1239f767300c14b199af7548543cbf83248b8ce63a8802d6042
+#+s6-linux-init.2c3c03a7e8ac0115768554a7959984f01be8283c02d0b38208ee17839fa8fe25
+#+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
+#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
+#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
+#+s6-networking.e7ad51c3d91b34bdf1945116b64655c4787e66e54931b7eb5cdf2daeafccacc6
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
#+confz.22f90e5b155ace65fd78ebe7f4c12d6ae9ddc3af14c51ddb99f9c47e19d39cdb
-#+containers.de880d8cacbb87b0a30e88654c81e291178ecd2c3717de59e0a64f694a8da8b8
+#+containers.4ab3e9e798fbdc13aeb84ff63edf12809cec8b239742247d703e44930969da26
#+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
-#+logincaps.0296b3435c8943a4138dbe4ccbb27d29cee31f1437c74b4c45218fb77873b10a
+#+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3
#+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
\ No newline at end of file
diff --git a/templates/pkg/libressl b/templates/pkg/libressl
@@ -14,5 +14,6 @@ check_static command/ocspcheck
x["./command/openssl"]=1
x["./command/ocspcheck"]=1
x["./man/man1/openssl.1"]=1
+ x["./library/libssl.a"]=1
{% endblock %}
diff --git a/templates/pkg/rsync b/templates/pkg/rsync
@@ -1,6 +1,7 @@
{% extends "autotools" %}
{%- block extra_deps %}
#+{{pkg_install_name("popt")}}
+#+{{pkg_install_name("libressl")}}
#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
{%- endblock %}
{% block at_script %}
@@ -8,7 +9,7 @@
autotools_static rsync-3.2.7 \
--disable-nls \
--without-included-popt \
- --disable-openssl \
+ --enable-openssl \
--disable-xxhash \
--disable-zstd \
--disable-lz4
diff --git a/templates/pkg/s6-networking b/templates/pkg/s6-networking
@@ -4,3 +4,4 @@
#+{{pkg_install_name("s6")}}
#+{{pkg_install_name("s6-dns")}}
{%- endblock %}
+{%- block extra_configure %}--enable-ssl=libtls{% endblock %}
diff --git a/templates/skaware b/templates/skaware
@@ -9,22 +9,9 @@
#@git:{{submodule.current[name]}}:{{name}}
: ${JOBS:=1}
-{#
-#export CC="$pthbs_build_environment/command/{{triplet}}-gcc"
-#export CXX="$pthbs_build_environment/command/{{triplet}}-g++"
-#export LD="$pthbs_build_environment/command/{{triplet}}-ld"
-#export AR="$pthbs_build_environment/command/{{triplet}}-ar"
-export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
-export CPATH="$pthbs_build_environment/include"
-#}
prefix={{versions}}/$pthbs_package
cd '{{name}}'
-{#
-# --libdir=DIR static library files [PREFIX/lib/$package]
-# --sysdepdir="${prefix}/sysdeps" \
-# --includedir="${prefix}/include" \
-#}
-./configure \
+./configure {% block extra_configure %}{% endblock %} \
--prefix="$prefix" \
--dynlibdir="${prefix}/library.so" \
--bindir="${prefix}/command" \
