diff options
Diffstat (limited to 'system/libssh2')
| -rw-r--r-- | system/libssh2/APKBUILD | 16 | ||||
| -rw-r--r-- | system/libssh2/fix-tests.patch | 11 | ||||
| -rw-r--r-- | system/libssh2/test-sshd.patch | 21 |
3 files changed, 12 insertions, 36 deletions
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index abf895908..b2a057903 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libssh2 -pkgver=1.10.0 +pkgver=1.11.1 pkgrel=0 pkgdesc="Library for accessing SSH servers" url="https://libssh2.org/" @@ -10,12 +10,8 @@ license="BSD-3-Clause" checkdepends="openssh-server" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" -#< 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 +source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz test-sshd.patch - fix-tests.patch " # secfixes: @@ -31,7 +27,8 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-rpath + --disable-rpath \ + --disable-docker-tests make } @@ -43,6 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30 libssh2-1.10.0.tar.gz -d6d4dfcd96bfa08210ecfb94c71624e011f294bab0b88548f41caff48283c2102ff012a6a6e71a100aa1d6430c8470fc0175449f31ae4583b6f8cfa224983603 test-sshd.patch -d075765062e3ffefb90902c9644ecde17f9bb39eac8ab5759370a26206f5804cb71b8b2d9b8d3ce9989c209bc36483dbc25f894f8c0ec9081aaef1a489c048df fix-tests.patch" +sha512sums="8703636fc28f0b12c8171712f3d605e0466a5bb9ba06e136c3203548fc3408ab07defd71dc801d7009a337e1e02fd60e8933a2a526d5ef0ce53153058d201233 libssh2-1.11.1.tar.gz +3df4e616bfa994876d60c1a6883a3d48c6c51d20423e2a7d2fa13cfc9ce61b0079bd17f51a0fcc1cc0de2dd9e8b06b5bbc59ad20389128781929ef3d5ef7ef8d test-sshd.patch" diff --git a/system/libssh2/fix-tests.patch b/system/libssh2/fix-tests.patch deleted file mode 100644 index 29f554991..000000000 --- a/system/libssh2/fix-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 5daa8ce00..a4bf65615 100644 --- a/system/libssh2/test-sshd.patch +++ b/system/libssh2/test-sshd.patch @@ -1,21 +1,12 @@ ---- libssh2-1.9.0/tests/ssh2.sh 2010-10-25 17:15:14.000000000 -0500 -+++ libssh2-1.9.0/tests/ssh2.sh 2019-09-11 18:52:25.932354801 -0500 -@@ -28,6 +28,7 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host - -o 'UsePrivilegeSeparation no' \ - -o 'StrictModes no' \ - -D \ -+ -e \ - $libssh2_sshd_params & - sshdpid=$! - ---- 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 -@@ -147,20 +147,6 @@ int main(int argc, char *argv[]) +--- libssh2-1.9.0/tests/test_ssh2.c 2019-03-26 08:08:54.000000000 -0500 ++++ libssh2-1.9.0/tests/test_ssh2.c 2019-09-11 19:38:03.782403778 -0500 +@@ -225,21 +225,6 @@ int main(int argc, char *argv[]) */ libssh2_channel_setenv(channel, "FOO", "bar"); - /* Request a terminal with 'vanilla' terminal emulation -- * See /etc/termcap for more options +- * See /etc/termcap for more options. This is useful when opening +- * an interactive shell. - */ - if(libssh2_channel_request_pty(channel, "vanilla")) { - fprintf(stderr, "Failed requesting pty\n"); @@ -28,6 +19,6 @@ - goto shutdown; - } - - ec = 0; + rc = 0; skip_shell: |