From 40b7b544a3194967cf95af95597f8ce76d59ee43 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:02:10 +0300 Subject: [PATCH 01/16] rust: depend on openssl --- extra/rust/build | 12 +++--------- extra/rust/depends | 2 +- extra/rust/patches/libressl.patch | 13 ------------- extra/rust/sources | 1 - 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 extra/rust/patches/libressl.patch diff --git a/extra/rust/build b/extra/rust/build index d27cbe82..063aee5f 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -1,7 +1,5 @@ #!/bin/sh -e -patch -p1 < libressl.patch - # This package mimics the download process of rust's 'x.py' # bootstrap library to allow for the removal of the internet # connection requirement per build. @@ -23,13 +21,9 @@ do done # Ignore checksums of files modified above. -for f in \ - vendor/openssl-sys/.cargo-checksum.json \ - vendor/rustc-ap-rustc_target/.cargo-checksum.json -do - sed 's/\("files":{\)[^}]*/\1/' "$f" > _ - mv -f _ "$f" -done +sed 's/\("files":{\)[^}]*/\1/' \ + vendor/rustc-ap-rustc_target/.cargo-checksum.json > _ +mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json cat > config.toml < ('3', '1', '0'), - (3, 1, _) => ('3', '1', 'x'), - (3, 2, 0) => ('3', '2', '0'), -+ (3, 2, 1) => ('3', '2', '1'), -+ (3, 3, _) => ('3', '3', 'x'), - _ => version_error(), - }; - diff --git a/extra/rust/sources b/extra/rust/sources index 74a699d1..cea27b13 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -2,4 +2,3 @@ https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract -patches/libressl.patch From c5f35ce4749b7fd9a94f27391a7d7fc3447c1907 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:08:00 +0300 Subject: [PATCH 02/16] openssh: depend on openssl --- extra/openssh/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/openssh/depends b/extra/openssh/depends index 9ee911ae..ca7e4ff8 100644 --- a/extra/openssh/depends +++ b/extra/openssh/depends @@ -1,2 +1,2 @@ -libressl +openssl zlib From 1b4c581811a62a2184f32cf9af107b14790742e3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:08:50 +0300 Subject: [PATCH 03/16] wpa_supplicant: depend on openssl --- extra/wpa_supplicant/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/wpa_supplicant/depends b/extra/wpa_supplicant/depends index 86dfce43..c32737c2 100644 --- a/extra/wpa_supplicant/depends +++ b/extra/wpa_supplicant/depends @@ -1,2 +1,2 @@ -libressl linux-headers make +openssl From 197217d67ba6f5b5491b63c16ec96af595d0f923 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:06:00 +0300 Subject: [PATCH 04/16] git: depend on openssl --- core/git/depends | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/git/depends b/core/git/depends index c818a087..3f8472a3 100644 --- a/core/git/depends +++ b/core/git/depends @@ -1,3 +1,3 @@ -curl make -libressl make -zlib make +curl make +openssl make +zlib make From 99238b3deeebc79e34364c4a9ff39f9bc9f6e53b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:06:59 +0300 Subject: [PATCH 05/16] ffmpeg: depend on openssl --- extra/ffmpeg/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/ffmpeg/depends b/extra/ffmpeg/depends index b4ef3140..fea888b0 100644 --- a/extra/ffmpeg/depends +++ b/extra/ffmpeg/depends @@ -3,12 +3,12 @@ lame libass libdrm libogg -libressl libvorbis libvpx libwebp linux-headers make nasm make +openssl opus pkgconf make x264 From 925d606edf25bc35b72b9c92ede08dbe362a612b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:00:14 +0300 Subject: [PATCH 06/16] nodejs: add openssl to depends --- extra/nodejs/build | 1 + extra/nodejs/depends | 1 + 2 files changed, 2 insertions(+) diff --git a/extra/nodejs/build b/extra/nodejs/build index 22b3da0e..be7192a3 100755 --- a/extra/nodejs/build +++ b/extra/nodejs/build @@ -2,6 +2,7 @@ ./configure \ --shared-zlib \ + --shared-openssl \ --with-intl=none \ --without-etw \ --without-dtrace \ diff --git a/extra/nodejs/depends b/extra/nodejs/depends index 282de481..21845d14 100644 --- a/extra/nodejs/depends +++ b/extra/nodejs/depends @@ -1,4 +1,5 @@ linux-headers make +openssl python make samurai make zlib From 5e853ed5db5229ecae01e004be55700d77652a55 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:09:22 +0300 Subject: [PATCH 07/16] mutt: depend on openssl --- extra/mutt/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/mutt/depends b/extra/mutt/depends index c375091c..35622105 100644 --- a/extra/mutt/depends +++ b/extra/mutt/depends @@ -1,3 +1,3 @@ -libressl ncurses +openssl zlib From 2716d66de1a92fa0982af54beb15da34780c8aab Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:09:46 +0300 Subject: [PATCH 08/16] python: depend on openssl --- extra/python/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/python/depends b/extra/python/depends index 87a1a560..82849f0a 100644 --- a/extra/python/depends +++ b/extra/python/depends @@ -1,6 +1,6 @@ bzip2 expat libffi -libressl +openssl sqlite zlib From af8240312f74639d5f2a23d0b424fef600496aa5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:13:11 +0300 Subject: [PATCH 09/16] xorg-server: depend on openssl --- xorg/xorg-server/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends index e788e009..baa6d013 100644 --- a/xorg/xorg-server/depends +++ b/xorg/xorg-server/depends @@ -11,12 +11,12 @@ libdrm libepoxy libfontenc libpciaccess -libressl libxcb libxkbfile libxshmfence linux-headers make mesa +openssl pixman pkgconf make xkeyboard-config From 69fc1dd5a41b37ebc7ef908ecc832473b36d9155 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:10:10 +0300 Subject: [PATCH 10/16] cmake: depend on openssl --- extra/cmake/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/cmake/depends b/extra/cmake/depends index 1a518417..a0065dcc 100644 --- a/extra/cmake/depends +++ b/extra/cmake/depends @@ -1,6 +1,6 @@ bzip2 curl expat -libressl linux-headers make +openssl zlib From 9e78e4fc47c1de7af0753e03f6d5ef17cec67e43 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:06:18 +0300 Subject: [PATCH 11/16] curl: depend on openssl --- core/curl/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/curl/depends b/core/curl/depends index 9ee911ae..ca7e4ff8 100644 --- a/core/curl/depends +++ b/core/curl/depends @@ -1,2 +1,2 @@ -libressl +openssl zlib From 23887e8ee9a30333dc5efb3fd53422ab0efb45c4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:07:27 +0300 Subject: [PATCH 12/16] gnupg1: depend on openssl --- extra/gnupg1/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/gnupg1/depends b/extra/gnupg1/depends index 82362fae..79615230 100644 --- a/extra/gnupg1/depends +++ b/extra/gnupg1/depends @@ -1,4 +1,4 @@ bzip2 curl -libressl +openssl zlib From c032e70b221eb4df2ee97ddd4ce2072849a2ca19 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:10:26 +0300 Subject: [PATCH 13/16] libressl: drop package --- core/libressl/build | 13 ------------- core/libressl/checksums | 2 -- core/libressl/files/update-certdata.sh | 12 ------------ core/libressl/post-install | 3 --- core/libressl/sources | 2 -- core/libressl/version | 1 - 6 files changed, 33 deletions(-) delete mode 100755 core/libressl/build delete mode 100644 core/libressl/checksums delete mode 100755 core/libressl/files/update-certdata.sh delete mode 100755 core/libressl/post-install delete mode 100644 core/libressl/sources delete mode 100644 core/libressl/version diff --git a/core/libressl/build b/core/libressl/build deleted file mode 100755 index a8558418..00000000 --- a/core/libressl/build +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -./configure \ - --prefix=/usr \ - --sysconfdir=/etc - -make -make DESTDIR="$1" install - -cp -f update-certdata.sh "$1/etc/ssl" - -# Remove library documentation. -rm -rf "$1/usr/share/man/man3" diff --git a/core/libressl/checksums b/core/libressl/checksums deleted file mode 100644 index cb08f760..00000000 --- a/core/libressl/checksums +++ /dev/null @@ -1,2 +0,0 @@ -a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 -d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89 diff --git a/core/libressl/files/update-certdata.sh b/core/libressl/files/update-certdata.sh deleted file mode 100755 index 29230cfb..00000000 --- a/core/libressl/files/update-certdata.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -[ -w /etc/ssl ] || { - printf '%s\n' "${0##*/}: root required to update cert." >&2 - exit 1 -} - -cd /etc/ssl && { - curl -LO https://curl.haxx.se/ca/cacert.pem - mv -f cacert.pem cert.pem - printf '%s\n' "${0##*/}: updated cert.pem" -} diff --git a/core/libressl/post-install b/core/libressl/post-install deleted file mode 100755 index c12dca76..00000000 --- a/core/libressl/post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/etc/ssl/update-certdata.sh diff --git a/core/libressl/sources b/core/libressl/sources deleted file mode 100644 index 79ed0b2e..00000000 --- a/core/libressl/sources +++ /dev/null @@ -1,2 +0,0 @@ -https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.3.tar.gz -files/update-certdata.sh diff --git a/core/libressl/version b/core/libressl/version deleted file mode 100644 index e82f87fb..00000000 --- a/core/libressl/version +++ /dev/null @@ -1 +0,0 @@ -3.3.3 1 From a871a096c243f5a96d43445d59062d3e36f092c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 00:10:46 +0300 Subject: [PATCH 14/16] openssl: 1.1.1k --- {testing => core}/openssl/build | 0 {testing => core}/openssl/checksums | 0 {testing => core}/openssl/depends | 0 {testing => core}/openssl/files/update-certdata.sh | 0 {testing => core}/openssl/post-install | 0 {testing => core}/openssl/sources | 0 {testing => core}/openssl/version | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {testing => core}/openssl/build (100%) rename {testing => core}/openssl/checksums (100%) rename {testing => core}/openssl/depends (100%) rename {testing => core}/openssl/files/update-certdata.sh (100%) rename {testing => core}/openssl/post-install (100%) rename {testing => core}/openssl/sources (100%) rename {testing => core}/openssl/version (100%) diff --git a/testing/openssl/build b/core/openssl/build similarity index 100% rename from testing/openssl/build rename to core/openssl/build diff --git a/testing/openssl/checksums b/core/openssl/checksums similarity index 100% rename from testing/openssl/checksums rename to core/openssl/checksums diff --git a/testing/openssl/depends b/core/openssl/depends similarity index 100% rename from testing/openssl/depends rename to core/openssl/depends diff --git a/testing/openssl/files/update-certdata.sh b/core/openssl/files/update-certdata.sh similarity index 100% rename from testing/openssl/files/update-certdata.sh rename to core/openssl/files/update-certdata.sh diff --git a/testing/openssl/post-install b/core/openssl/post-install similarity index 100% rename from testing/openssl/post-install rename to core/openssl/post-install diff --git a/testing/openssl/sources b/core/openssl/sources similarity index 100% rename from testing/openssl/sources rename to core/openssl/sources diff --git a/testing/openssl/version b/core/openssl/version similarity index 100% rename from testing/openssl/version rename to core/openssl/version From f29b70a34c0c47c85d270d55daf81a3355a7f095 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 10 Jul 2021 23:51:34 +0300 Subject: [PATCH 15/16] openssl: provide libtls (libretls) --- core/openssl/build | 16 +++++++++++++++- core/openssl/checksums | 1 + core/openssl/sources | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/openssl/build b/core/openssl/build index a696f653..92eaddf4 100755 --- a/core/openssl/build +++ b/core/openssl/build @@ -4,10 +4,24 @@ --prefix=/usr \ --openssldir=/etc/ssl \ --libdir=lib \ - shared linux-x86_64 + no-unit-test \ + shared \ + linux-x86_64 make depend make make DESTDIR="$1" install_sw install_ssldirs cp -f update-certdata.sh "$1/etc/ssl" + +# Libretls is LibreSSL's libtls library for OpenSSL. +( + cd libretls + + ./configure \ + --prefix=/usr \ + --with-openssl="$1/usr" + + make + make DESTDIR="$1" install +) diff --git a/core/openssl/checksums b/core/openssl/checksums index a3f6dfcd..195f3029 100644 --- a/core/openssl/checksums +++ b/core/openssl/checksums @@ -1,2 +1,3 @@ 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 +8a5b38a76b778da8d6f4236f1ea89e680daea971be6ee3a57e4e7ae99a883aa2 d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89 diff --git a/core/openssl/sources b/core/openssl/sources index c265c391..ecfe35e6 100644 --- a/core/openssl/sources +++ b/core/openssl/sources @@ -1,2 +1,3 @@ https://www.openssl.org/source/openssl-1.1.1k.tar.gz +https://causal.agency/libretls/libretls-3.3.3p1.tar.gz libretls files/update-certdata.sh From 4f730b29877276ba7bc0b7c1beeb96322dafea47 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Jul 2021 15:43:36 +0300 Subject: [PATCH 16/16] kiss: 5.4.11 --- core/kiss/checksums | 2 +- core/kiss/sources | 2 +- core/kiss/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/kiss/checksums b/core/kiss/checksums index 049386e3..efd28a83 100644 --- a/core/kiss/checksums +++ b/core/kiss/checksums @@ -1,3 +1,3 @@ -017a7250a8aa93b7ef542c558220559a3fd7ce6f2c19d80d5e162b8064d40511 +7464abff463701c3b205ade00a5279f7d788380c0534e9d22132922b774b363a a3a8af6338ad5e66369765f5dbcdc04c0545d00d3087ecfd6fa0c5ca02b69ef9 f6d4ddad62c1ae7e4c32b41f6008494ad9ed433092ff83026f2cfaf5a5e94ad2 diff --git a/core/kiss/sources b/core/kiss/sources index 087b3bdc..c87e697a 100644 --- a/core/kiss/sources +++ b/core/kiss/sources @@ -1,3 +1,3 @@ -https://github.com/kisslinux/kiss/archive/5.4.10.tar.gz +https://github.com/kisslinux/kiss/archive/5.4.11.tar.gz https://github.com/kisslinux/website/archive/242b7b60d824f4c8ace259405f602ff05ddfef31.tar.gz docs https://github.com/kisslinux/wiki/archive/ad8b8f780f88d50060b1feef88b78528d9abba2e.tar.gz wiki diff --git a/core/kiss/version b/core/kiss/version index cbc35976..95090772 100644 --- a/core/kiss/version +++ b/core/kiss/version @@ -1 +1 @@ -5.4.10 1 +5.4.11 1