forked from kiss-community/repo
merge
This commit is contained in:
commit
17ccc22ef3
|
@ -1,2 +1,2 @@
|
||||||
libressl
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
curl make
|
curl make
|
||||||
libressl make
|
openssl make
|
||||||
zlib make
|
zlib make
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
017a7250a8aa93b7ef542c558220559a3fd7ce6f2c19d80d5e162b8064d40511
|
017a7250a8aa93b7ef542c558220559a3fd7ce6f2c19d80d5e162b8064d40511
|
||||||
2ccff0e0d00ef8b8959b1b9d2e058a962f7d0854309e6b4fe01ca255c47be1e6
|
2ccff0e0d00ef8b8959b1b9d2e058a962f7d0854309e6b4fe01ca255c47be1e6
|
||||||
e6382f351301ac34b5a22d4439de6d4ae9dc8c7296b60ff128657e1d826ebb9d
|
e6382f351301ac34b5a22d4439de6d4ae9dc8c7296b60ff128657e1d826ebb9d
|
||||||
|
=======
|
||||||
|
7464abff463701c3b205ade00a5279f7d788380c0534e9d22132922b774b363a
|
||||||
|
a3a8af6338ad5e66369765f5dbcdc04c0545d00d3087ecfd6fa0c5ca02b69ef9
|
||||||
|
f6d4ddad62c1ae7e4c32b41f6008494ad9ed433092ff83026f2cfaf5a5e94ad2
|
||||||
|
>>>>>>> master
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
https://github.com/kisslinux/kiss/archive/5.4.10.tar.gz
|
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/website/archive/8253556796319ad218f773fe066731666e9fde1e.tar.gz docs
|
||||||
https://github.com/kisslinux/wiki/archive/3726719598b0fadac5ad140492a4bad04cdef372.tar.gz wiki
|
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
|
||||||
|
|
|
@ -1 +1,5 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
5.4.10 2
|
5.4.10 2
|
||||||
|
=======
|
||||||
|
5.4.11 1
|
||||||
|
>>>>>>> master
|
||||||
|
|
|
@ -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"
|
|
|
@ -1,2 +0,0 @@
|
||||||
a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
|
|
||||||
d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89
|
|
|
@ -1,2 +0,0 @@
|
||||||
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.3.tar.gz
|
|
||||||
files/update-certdata.sh
|
|
|
@ -1 +0,0 @@
|
||||||
3.3.3 1
|
|
27
core/openssl/build
Executable file
27
core/openssl/build
Executable file
|
@ -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
|
||||||
|
)
|
3
core/openssl/checksums
Normal file
3
core/openssl/checksums
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
|
||||||
|
8a5b38a76b778da8d6f4236f1ea89e680daea971be6ee3a57e4e7ae99a883aa2
|
||||||
|
d4bfcd9ee16eff65bdf6de1e0a3ccac667fdf52d98d0eda5c3e3f638aad13b89
|
1
core/openssl/depends
Normal file
1
core/openssl/depends
Normal file
|
@ -0,0 +1 @@
|
||||||
|
perl make
|
3
core/openssl/sources
Normal file
3
core/openssl/sources
Normal file
|
@ -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
|
1
core/openssl/version
Normal file
1
core/openssl/version
Normal file
|
@ -0,0 +1 @@
|
||||||
|
1.1.1k 1
|
|
@ -1,6 +1,6 @@
|
||||||
bzip2
|
bzip2
|
||||||
curl
|
curl
|
||||||
expat
|
expat
|
||||||
libressl
|
|
||||||
linux-headers make
|
linux-headers make
|
||||||
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -3,12 +3,12 @@ lame
|
||||||
libass
|
libass
|
||||||
libdrm
|
libdrm
|
||||||
libogg
|
libogg
|
||||||
libressl
|
|
||||||
libvorbis
|
libvorbis
|
||||||
libvpx
|
libvpx
|
||||||
libwebp
|
libwebp
|
||||||
linux-headers make
|
linux-headers make
|
||||||
nasm make
|
nasm make
|
||||||
|
openssl
|
||||||
opus
|
opus
|
||||||
pkgconf make
|
pkgconf make
|
||||||
x264
|
x264
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
bzip2
|
bzip2
|
||||||
curl
|
curl
|
||||||
libressl
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
libressl
|
|
||||||
ncurses
|
ncurses
|
||||||
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
./configure \
|
./configure \
|
||||||
--shared-zlib \
|
--shared-zlib \
|
||||||
|
--shared-openssl \
|
||||||
--with-intl=none \
|
--with-intl=none \
|
||||||
--without-etw \
|
--without-etw \
|
||||||
--without-dtrace \
|
--without-dtrace \
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
linux-headers make
|
linux-headers make
|
||||||
|
openssl
|
||||||
python make
|
python make
|
||||||
samurai make
|
samurai make
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
libressl
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
bzip2
|
bzip2
|
||||||
expat
|
expat
|
||||||
libffi
|
libffi
|
||||||
libressl
|
openssl
|
||||||
sqlite
|
sqlite
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
patch -p1 < libressl.patch
|
|
||||||
|
|
||||||
# This package mimics the download process of rust's 'x.py'
|
# This package mimics the download process of rust's 'x.py'
|
||||||
# bootstrap library to allow for the removal of the internet
|
# bootstrap library to allow for the removal of the internet
|
||||||
# connection requirement per build.
|
# connection requirement per build.
|
||||||
|
@ -23,13 +21,9 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Ignore checksums of files modified above.
|
# Ignore checksums of files modified above.
|
||||||
for f in \
|
sed 's/\("files":{\)[^}]*/\1/' \
|
||||||
vendor/openssl-sys/.cargo-checksum.json \
|
vendor/rustc-ap-rustc_target/.cargo-checksum.json > _
|
||||||
vendor/rustc-ap-rustc_target/.cargo-checksum.json
|
mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json
|
||||||
do
|
|
||||||
sed 's/\("files":{\)[^}]*/\1/' "$f" > _
|
|
||||||
mv -f _ "$f"
|
|
||||||
done
|
|
||||||
|
|
||||||
cat > config.toml <<EOF
|
cat > config.toml <<EOF
|
||||||
[llvm]
|
[llvm]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
cmake make
|
cmake make
|
||||||
curl make
|
curl make
|
||||||
libressl
|
openssl
|
||||||
llvm
|
llvm
|
||||||
pkgconf make
|
pkgconf make
|
||||||
python make
|
python make
|
||||||
|
|
|
@ -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(),
|
|
||||||
};
|
|
||||||
|
|
|
@ -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/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/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
|
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
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
libressl
|
|
||||||
linux-headers make
|
linux-headers make
|
||||||
|
openssl
|
||||||
|
|
24
xorg/xorg-server/depends
Normal file
24
xorg/xorg-server/depends
Normal file
|
@ -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
|
Loading…
Reference in New Issue
Block a user