merge

2021-07-11 21:21:01 +03:00 · 2021-07-11 21:21:01 +03:00 · 17ccc22ef3
commit 17ccc22ef3
parent a4b58e1ef9 94bab7f5c7
30 changed files with 92 additions and 53 deletions
--- a/core/curl/depends
+++ b/core/curl/depends
@ -1,2 +1,2 @@
-libressl
+openssl
 zlib
--- a/core/git/depends
+++ b/core/git/depends
@ -1,3 +1,3 @@
-curl     make
-libressl make
-zlib     make
+curl    make
+openssl make
+zlib    make
--- a/core/kiss/checksums
+++ b/core/kiss/checksums
@ -1,3 +1,9 @@
+<<<<<<< HEAD
 017a7250a8aa93b7ef542c558220559a3fd7ce6f2c19d80d5e162b8064d40511
 2ccff0e0d00ef8b8959b1b9d2e058a962f7d0854309e6b4fe01ca255c47be1e6
 e6382f351301ac34b5a22d4439de6d4ae9dc8c7296b60ff128657e1d826ebb9d
+=======
+7464abff463701c3b205ade00a5279f7d788380c0534e9d22132922b774b363a
+a3a8af6338ad5e66369765f5dbcdc04c0545d00d3087ecfd6fa0c5ca02b69ef9
+f6d4ddad62c1ae7e4c32b41f6008494ad9ed433092ff83026f2cfaf5a5e94ad2
+>>>>>>> master
--- a/core/kiss/sources
+++ b/core/kiss/sources
@ -1,3 +1,9 @@
+<<<<<<< HEAD
 https://github.com/kisslinux/kiss/archive/5.4.10.tar.gz
 https://github.com/kisslinux/website/archive/8253556796319ad218f773fe066731666e9fde1e.tar.gz docs
 https://github.com/kisslinux/wiki/archive/3726719598b0fadac5ad140492a4bad04cdef372.tar.gz wiki
+=======
+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
+>>>>>>> master
--- a/core/kiss/version
+++ b/core/kiss/version
@ -1 +1,5 @@
+<<<<<<< HEAD
 5.4.10 2
+=======
+5.4.11 1
+>>>>>>> master
--- a/core/libressl/build
+++ b/core/libressl/build
@ -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"
--- a/core/libressl/checksums
+++ b/core/libressl/checksums
@ -1,2 +0,0 @@
-a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
-d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89
--- a/core/libressl/sources
+++ b/core/libressl/sources
@ -1,2 +0,0 @@
-https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.3.tar.gz
-files/update-certdata.sh
--- a/core/libressl/version
+++ b/core/libressl/version
@ -1 +0,0 @@
-3.3.3 1
--- a/core/openssl/build
+++ b/core/openssl/build
@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+./Configure \
+    --prefix=/usr \
+    --openssldir=/etc/ssl \
+    --libdir=lib \
+    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
+)
--- a/core/openssl/checksums
+++ b/core/openssl/checksums
@ -0,0 +1,3 @@
+892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
+8a5b38a76b778da8d6f4236f1ea89e680daea971be6ee3a57e4e7ae99a883aa2
+d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89
--- a/core/openssl/depends
+++ b/core/openssl/depends
@ -0,0 +1 @@
+perl make
--- a/core/libressl/files/update-certdata.sh
+++ b/core/libressl/files/update-certdata.sh
--- a/core/libressl/post-install
+++ b/core/libressl/post-install
--- a/core/openssl/sources
+++ b/core/openssl/sources
@ -0,0 +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
--- a/core/openssl/version
+++ b/core/openssl/version
@ -0,0 +1 @@
+1.1.1k 1
--- a/extra/cmake/depends
+++ b/extra/cmake/depends
@ -1,6 +1,6 @@
 bzip2
 curl
 expat
-libressl
 linux-headers make
+openssl
 zlib
--- 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
--- a/extra/gnupg1/depends
+++ b/extra/gnupg1/depends
@ -1,4 +1,4 @@
 bzip2
 curl
-libressl
+openssl
 zlib
--- a/extra/mutt/depends
+++ b/extra/mutt/depends
@ -1,3 +1,3 @@
-libressl
 ncurses
+openssl
 zlib
--- a/extra/nodejs/build
+++ b/extra/nodejs/build
@ -2,6 +2,7 @@

 ./configure \
    --shared-zlib \
+    --shared-openssl \
    --with-intl=none \
    --without-etw \
    --without-dtrace \
--- a/extra/nodejs/depends
+++ b/extra/nodejs/depends
@ -1,4 +1,5 @@
 linux-headers make
+openssl
 python        make
 samurai       make
 zlib
--- a/extra/openssh/depends
+++ b/extra/openssh/depends
@ -1,2 +1,2 @@
-libressl
+openssl
 zlib
--- a/extra/python/depends
+++ b/extra/python/depends
@ -1,6 +1,6 @@
 bzip2
 expat
 libffi
-libressl
+openssl
 sqlite
 zlib
--- 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 <<EOF
 [llvm]
--- a/extra/rust/depends
+++ b/extra/rust/depends
@ -1,6 +1,6 @@
 cmake   make
 curl    make
-libressl
+openssl
 llvm
 pkgconf make
 python  make
--- a/extra/rust/patches/libressl.patch
+++ b/extra/rust/patches/libressl.patch
@ -1,13 +0,0 @@
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
-index 49f26d2b7..27deb1f36 100644
--- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -221,6 +221,8 @@ See rust-openssl README for more information:
-             (3, 1, 0) => ('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(),
-         };
-
--- 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
--- a/extra/wpa_supplicant/depends
+++ b/extra/wpa_supplicant/depends
@ -1,2 +1,2 @@
-libressl
 linux-headers make
+openssl
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@ -0,0 +1,24 @@
+bzip2
+freetype-harfbuzz
+libX11
+libXau
+libXdamage
+libXext
+libXfixes
+libXfont2
+libXxf86vm
+libdrm
+libepoxy
+libfontenc
+libpciaccess
+libxcb
+libxkbfile
+libxshmfence
+linux-headers make
+mesa
+openssl
+pixman
+pkgconf make
+xkeyboard-config
+xtrans make
+zlib