чување c44d4fd4efa536969bee12d81a4654689f535335
родитељ 7cdea7133c9a9bf45691636eaf10e994ad3e1f5a
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Wed, 3 May 2023 22:35:02 +0200
Merge branch 'master' of git.sr.ht:~strahinja/galeb
Diffstat:
измењених датотека: 5, додавања: 52(+), брисања: 8(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -33,7 +33,7 @@ msg info "Creating symlinks"
begin_step "packages"
-totalsubsteps=137
+totalsubsteps=138
substep=1
msg info "Creating temporary links"
@@ -2721,6 +2721,7 @@ mkpk_install()
PREFIX=/ # deliberate (config requires absolute path)
DESTDIR=/build
export CFLAGS LDFLAGS PREFIX DESTDIR
+ SED=/sucks/bin/sed
./config --prefix="\${PREFIX}" \\
--openssldir=/etc/ssl \\
@@ -2728,11 +2729,12 @@ mkpk_install()
no-shared zlib
make ${JN} || exit 1
+ \${SED} -i.bak 's/^\\(Requires: .*\\)/\\1 zlib/' openssl.pc
make MANSUFFIX=ssl DESTDIR=\${DESTDIR} install
}
!
mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
+ #remove_dir ${G_SRC}/${pkg}
unpack_pkg ${pkg} /
) || exit 1
fi
@@ -2740,6 +2742,45 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" openssl 3.1.0 "${timestamp}" >>${G_PKGDB}
end_substep
+begin_substep libretls-3.7.0
+if [ -e /lib/libtls.a ]; then
+ msg info "%s exists, skipping %s" /lib/libtls.a ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-Os -pipe -static --static -fcommon -fPIC'
+ LDFLAGS='-static --static -fcommon -s'
+ PREFIX=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS PREFIX DESTDIR
+
+ ./configure --prefix="\${PREFIX}"
+
+ make ${JN} || exit 1
+ make DESTDIR="\${DESTDIR}" install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" libretls 3.7.0 "${timestamp}" >>${G_PKGDB}
+end_substep
+
# # LibreSSL doesn't suck, even though technically IMHO it should belong in /sucks
# # since currently I don't see a clear way to produce both static and dynamic
# # libraries while keeping binaries static
diff --git a/04-finale.sh b/04-finale.sh
@@ -262,13 +262,13 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" ubase 20230412 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep svc-0.3
+begin_substep svc-0.4
if [ -x /bin/svc ]; then
msg info "%s exists, skipping %s" /bin/svc ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
else
- extract_pkg ${G_SRC} svc-v0.3 ${pkg}.tar.gz ${pkg}
+ extract_pkg ${G_SRC} svc-v0.4 ${pkg}.tar.gz ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
@@ -294,7 +294,7 @@ mkpk_install()
) || exit 1
fi
timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" svc 0.3 "${timestamp}" >>${G_PKGDB}
+printf "%s\t%s\t%s\n" svc 0.4 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep mkpk-0.1.16
diff --git a/TODO b/TODO
@@ -4,9 +4,11 @@ TODO
High priority
-------------
+[ ] Add BOOTING to galeb-howtos (and to the base image)
+
[x] Galeb 2.2 roadmap (cca summer 2023)
[x] Update all packages
- [~] Continue work on X.Org
+ [x] Continue work on X.Org
- Continued in galeb-mkfiles...
[x] Add and test wpa_supplicant
diff --git a/lib/env.sh b/lib/env.sh
@@ -54,7 +54,7 @@ G_PAT=${G_SRC}/${PTD}
G_PKG=${G_SRC}/pkg
G_SHORTLOG=${G_LOG}/shortlog
G_TARGET=x86_64-galeb-linux-musl
-G_VER=2.2.2
+G_VER=2.2.3
JN=${JN:- -j$(($(grep ^processor /proc/cpuinfo | wc -l) * 3))}
G_PKGDB=${G_SPKG}/pkgdb.tsv
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -20,6 +20,7 @@ http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz 08521391d16ba5adf80278e
http://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.xz 51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833
http://xmlsoft.org/sources/libxml2-2.9.12.tar.gz df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
https://astron.com/pub/file/file-5.44.tar.gz 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
+https://causal.agency/libretls/libretls-3.7.0.tar.gz 18987d09ee804883e2c3cfae1209494b7020d976cc7137ba39540c18e0dc23d25034a46c6c64955201b425ca981e03cbe629f9ff979fd4a72d3dcfbd51efdf84
https://cmake.org/files/v3.26/cmake-3.26.3.tar.gz b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0
https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389
https://curl.se/download/curl-8.0.1.tar.xz 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d
@@ -75,7 +76,7 @@ https://git.sr.ht/~strahinja/galeb-mkinitramfs/archive/v0.4.tar.gz mkinitramfs-0
https://git.sr.ht/~strahinja/mkpk/archive/v0.1.16.tar.gz mkpk-0.1.16.tar.gz b1ab7352a6b2f1ade3e236b8e6c96c441da17242d2a304d447e655b63d2f90ff815c7f4718cc7de98e5d861cc501ec02d704226790dde0eab5b0ddff6bd2982b
https://git.sr.ht/~strahinja/sbase/archive/v0.2.tar.gz sbase-0.2.tar.gz 931e57202aacc56b8114bf58c8e34f4f22ed501b330165432fd69ce732bbc7e1be997ac9551c9f34ef892a4dd4f696f30eee38adc8eaee641055de1a161d0355
https://git.sr.ht/~strahinja/sled/archive/v0.11.5.tar.gz sled-0.11.5.tar.gz c329eb5086ea5ab76f109a1b15d8ec3c94c37bc09e306490502fd0b8592c59feeb6afd041d6ad14aaedf1c32902fe254951d9af83319c35d50f302fccfe1e138
-https://git.sr.ht/~strahinja/svc/archive/v0.3.tar.gz svc-0.3.tar.gz f7ee2ae944b0360d58eba7a01a1b584a14d8b87fa14d471ac504f12bc47edfdd2d471611c328976650ff6fa34486031733ad262246955ac22bf33bf73823ee24
+https://git.sr.ht/~strahinja/svc/archive/v0.4.tar.gz svc-0.4.tar.gz 4eb6abd1885b5ddea497e4943674677635d562c2cca5df74f1104522646a1a5c458d75c470da29399536a796fb791d35caaa595c848294f15e835fb2f928fe51
https://git.sr.ht/~strahinja/table/archive/v0.6.10.tar.gz table-0.6.10.tar.gz e608f3eb00ec45044f3a90fc57dfb720abfef0c8bd8892ea6c76d29430d7b791de5810d55c5748b9c79f37455c23caab80fadef333e0ebafbd0c2dc5e0bfcdac
https://github.com/ArtifexSoftware/urw-base35-fonts/archive/refs/tags/20200910.tar.gz urw-base35-20200910.tar.gz 71fb27baadf5abc4ff624cdede02038681acd5fffdc728a5b2e7808713b80cb2f2174f90a1862e69d390c4434c49d5167ab095100032fa3ba80b586eb8ae51d1
https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.1.tar.gz xxhash-0.8.1.tar.gz 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
