summaryrefslogtreecommitdiff
path: root/system/libssh2
diff options
context:
space:
mode:
Diffstat (limited to 'system/libssh2')
-rw-r--r--system/libssh2/APKBUILD22
-rw-r--r--system/libssh2/fix-tests.patch11
-rw-r--r--system/libssh2/test-sshd.patch2
3 files changed, 28 insertions, 7 deletions
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD
index 401fa2cf0..abf895908 100644
--- a/system/libssh2/APKBUILD
+++ b/system/libssh2/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libssh2
-pkgver=1.9.0
+pkgver=1.10.0
pkgrel=0
pkgdesc="Library for accessing SSH servers"
url="https://libssh2.org/"
@@ -10,8 +10,17 @@ license="BSD-3-Clause"
checkdepends="openssh-server"
makedepends="openssl-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz
- test-sshd.patch"
+#< zv> heads up that ipv6 on www.libssh2.org seems to be down
+#< bagder> yeah, I know. its a misconfigure thing since a while back
+#source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz
+source="https://github.com/libssh2/libssh2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+ test-sshd.patch
+ fix-tests.patch
+ "
+
+# secfixes:
+# 1.9.0-r1:
+# - CVE-2019-17498
build() {
./configure \
@@ -34,5 +43,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17 libssh2-1.9.0.tar.gz
-eef3c43184d53a3c655915ad61d182a88d9cced75ba8f8dde73ccf771ff4aeaa0f26e95aeb53601d7c47d96a2421c98678e9baf497f3883faa4427a091eea62c test-sshd.patch"
+sha512sums="e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30 libssh2-1.10.0.tar.gz
+d6d4dfcd96bfa08210ecfb94c71624e011f294bab0b88548f41caff48283c2102ff012a6a6e71a100aa1d6430c8470fc0175449f31ae4583b6f8cfa224983603 test-sshd.patch
+d075765062e3ffefb90902c9644ecde17f9bb39eac8ab5759370a26206f5804cb71b8b2d9b8d3ce9989c209bc36483dbc25f894f8c0ec9081aaef1a489c048df fix-tests.patch"
diff --git a/system/libssh2/fix-tests.patch b/system/libssh2/fix-tests.patch
new file mode 100644
index 000000000..29f554991
--- /dev/null
+++ b/system/libssh2/fix-tests.patch
@@ -0,0 +1,11 @@
+--- libssh2-1.9.0/tests/ssh2.sh.old 2022-04-27 23:22:54.532007741 -0500
++++ libssh2-1.9.0/tests/ssh2.sh 2022-04-27 23:34:30.501706060 -0500
+@@ -27,6 +27,8 @@
+ -o "AuthorizedKeysFile $srcdir/etc/user.pub" \
+ -o 'UsePrivilegeSeparation no' \
+ -o 'StrictModes no' \
++ -o 'HostkeyAlgorithms +ssh-rsa' \
++ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \
+ -D \
+ -e \
+ $libssh2_sshd_params &
diff --git a/system/libssh2/test-sshd.patch b/system/libssh2/test-sshd.patch
index 6cc6d711e..5daa8ce00 100644
--- a/system/libssh2/test-sshd.patch
+++ b/system/libssh2/test-sshd.patch
@@ -10,7 +10,7 @@
--- libssh2-1.9.0/tests/ssh2.c 2019-03-26 08:08:54.000000000 -0500
+++ libssh2-1.9.0/tests/ssh2.c 2019-09-11 19:38:03.782403778 -0500
-@@ -143,20 +143,6 @@ int main(int argc, char *argv[])
+@@ -147,20 +147,6 @@ int main(int argc, char *argv[])
*/
libssh2_channel_setenv(channel, "FOO", "bar");