aboutsummaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rwxr-xr-xextra/libressl/build13
-rw-r--r--extra/libressl/checksums2
-rwxr-xr-xextra/libressl/files/update-certdata.sh14
-rwxr-xr-xextra/libressl/post-install3
-rw-r--r--extra/libressl/sources2
-rwxr-xr-xextra/libressl/test2
-rw-r--r--extra/libressl/version1
-rwxr-xr-xextra/openssh/build3
-rw-r--r--extra/openssh/checksums2
-rw-r--r--extra/openssh/depends3
-rw-r--r--extra/openssh/sources2
11 files changed, 3 insertions, 44 deletions
diff --git a/extra/libressl/build b/extra/libressl/build
deleted file mode 100755
index 86ade623..00000000
--- a/extra/libressl/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc
-
-make
-make DESTDIR="$1" install
-
-install -Dm 755 update-certdata.sh "$1/etc/ssl"
-
-# Link ca-certificates to cert.pem
-ln -sfv ../cert.pem "$1/etc/ssl/certs/ca-certificates.crt"
diff --git a/extra/libressl/checksums b/extra/libressl/checksums
deleted file mode 100644
index 36db443b..00000000
--- a/extra/libressl/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-a6d331865e0164a13ac85a228e52517f7cf8f8488f2f95f34e7857302f97cfdb libressl-3.3.1.tar.gz
-043d2c3d64ecfaa021dbd1e772e42bf261917ef9b8b5b2ea955efd64c0791f00 update-certdata.sh
diff --git a/extra/libressl/files/update-certdata.sh b/extra/libressl/files/update-certdata.sh
deleted file mode 100755
index 611f944d..00000000
--- a/extra/libressl/files/update-certdata.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-#
-# update-certdata.sh
-
-[ -w "$CPT_ROOT/etc/ssl" ] || {
- printf '%s\n' "${0##*/}: root required to update CA certificates." >&2
- exit 1
-}
-
-cd "$CPT_ROOT/etc/ssl" && {
- wget https://curl.haxx.se/ca/cacert.pem
- mv -f cacert.pem cert.pem
- printf '%s\n' "${0##*/}: updated cert.pem"
-}
diff --git a/extra/libressl/post-install b/extra/libressl/post-install
deleted file mode 100755
index f39088e7..00000000
--- a/extra/libressl/post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$CPT_ROOT/etc/ssl/update-certdata.sh"
diff --git a/extra/libressl/sources b/extra/libressl/sources
deleted file mode 100644
index a598bcc5..00000000
--- a/extra/libressl/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-https://fossies.org/linux/misc/libressl-3.3.1.tar.gz
-files/update-certdata.sh
diff --git a/extra/libressl/test b/extra/libressl/test
deleted file mode 100755
index aabdfc94..00000000
--- a/extra/libressl/test
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-make check
diff --git a/extra/libressl/version b/extra/libressl/version
deleted file mode 100644
index a0fab29c..00000000
--- a/extra/libressl/version
+++ /dev/null
@@ -1 +0,0 @@
-3.3.1 1
diff --git a/extra/openssh/build b/extra/openssh/build
index a70f97a3..ff39eaa9 100755
--- a/extra/openssh/build
+++ b/extra/openssh/build
@@ -5,11 +5,8 @@ cpt-list libedit >/dev/null 2>&1 &&
libedit="--with-libedit" && LIBS="$(pkgconf --static --libs libedit)"
export LIBS
-
export LDFLAGS="$LDFLAGS -static"
-autoreconf -fi
-
./configure \
--prefix=/usr \
--sbindir=/usr/bin \
diff --git a/extra/openssh/checksums b/extra/openssh/checksums
index ad30e9ba..cecd0cbf 100644
--- a/extra/openssh/checksums
+++ b/extra/openssh/checksums
@@ -1,2 +1,2 @@
-bdd65f72c33a00fec5c154811c33e7b5a386c9b1aaabec3917b421af28adfc9a c80c7b3.tar.gz
+f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25 openssh-8.5p1.tar.gz
5d32a817344ac444424063d75e49afd95d7eb76d972ef5c5cfad355c8e8b1ff1 sshd.run
diff --git a/extra/openssh/depends b/extra/openssh/depends
index aefce7e1..3788ab13 100644
--- a/extra/openssh/depends
+++ b/extra/openssh/depends
@@ -1,3 +1,2 @@
-autoconf make
-bearssl make
+libressl make
zlib make
diff --git a/extra/openssh/sources b/extra/openssh/sources
index b71f0e4c..b02eef54 100644
--- a/extra/openssh/sources
+++ b/extra/openssh/sources
@@ -1,2 +1,2 @@
-https://github.com/oasislinux/openssh/archive/c80c7b3.tar.gz
+https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.5p1.tar.gz
files/sshd.run