* [PATCH] libssh2: Upgrade to v1.11.0
@ 2023-06-02 21:34 Sudip Mukherjee
2023-06-07 12:34 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Sudip Mukherjee @ 2023-06-02 21:34 UTC (permalink / raw)
To: openembedded-core; +Cc: Sudip Mukherjee
Changes:
Update license checksum: change in copyright year.
Remove patch fixed by upstream.
Disable rpath, hardcoded rpath failed curl-native build.
Adjust ptests.
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
.../libssh2/libssh2/fix-ssh2-test.patch | 23 -------------------
.../recipes-support/libssh2/libssh2/run-ptest | 2 +-
.../{libssh2_1.10.0.bb => libssh2_1.11.0.bb} | 16 ++++++++-----
3 files changed, 11 insertions(+), 30 deletions(-)
delete mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
rename meta/recipes-support/libssh2/{libssh2_1.10.0.bb => libssh2_1.11.0.bb} (67%)
diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
deleted file mode 100644
index ee916c42d4..0000000000
--- a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box,
-so we need to re-enable them as a workaround for the test
-suite until upstream updates the tests.
-
-See: https://github.com/libssh2/libssh2/issues/630
-
-Upstream-Status: Backport [alternative fixes merged upstream]
-
-Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5
-
---- a/tests/ssh2.sh
-+++ b/tests/ssh2.sh
-@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host
- -o 'Port 4711' \
- -o 'Protocol 2' \
- -o "AuthorizedKeysFile $srcdir/etc/user.pub" \
-- -o 'UsePrivilegeSeparation no' \
-+ -o 'HostKeyAlgorithms +ssh-rsa' \
-+ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \
- -o 'StrictModes no' \
- -D \
- $libssh2_sshd_params &
-
diff --git a/meta/recipes-support/libssh2/libssh2/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest
index 5e7426f79d..ed87074fcd 100644
--- a/meta/recipes-support/libssh2/libssh2/run-ptest
+++ b/meta/recipes-support/libssh2/libssh2/run-ptest
@@ -2,7 +2,7 @@
ptestdir=$(dirname "$(readlink -f "$0")")
cd tests
-for test in simple mansyntax.sh ssh2.sh
+for test in test_simple mansyntax.sh test_sshd.test
do
./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test
done
diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb
similarity index 67%
rename from meta/recipes-support/libssh2/libssh2_1.10.0.bb
rename to meta/recipes-support/libssh2/libssh2_1.11.0.bb
index d5513373b0..31a3c0c90b 100644
--- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb
+++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb
@@ -5,20 +5,20 @@ SECTION = "libs"
DEPENDS = "zlib"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225"
SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \
- file://fix-ssh2-test.patch \
file://run-ptest \
"
-SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51"
+SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461"
inherit autotools pkgconfig ptest
EXTRA_OECONF += "\
--with-libz \
--with-libz-prefix=${STAGING_LIBDIR} \
+ --disable-rpath \
"
# only one of openssl and gcrypt could be set
@@ -41,9 +41,13 @@ do_install_ptest() {
install -d ${D}${PTEST_PATH}/tests
install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/
cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/
- cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/
- cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/
- cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/
+ cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/
+ cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/
+ cp -rf ${S}/tests/test_sshd.test ${D}${PTEST_PATH}/tests/
+ cp -rf ${S}/tests/openssh_server ${D}${PTEST_PATH}/tests/
+ cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/
+# Makefile.inc required as test_sshd.test generates the list of test from this
+ cp -rf ${S}/tests/Makefile.inc ${D}${PTEST_PATH}/tests/
mkdir -p ${D}${PTEST_PATH}/docs
cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/
}
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] libssh2: Upgrade to v1.11.0
2023-06-02 21:34 [PATCH] libssh2: Upgrade to v1.11.0 Sudip Mukherjee
@ 2023-06-07 12:34 ` Alexandre Belloni
2023-06-11 20:43 ` Sudip Mukherjee
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2023-06-07 12:34 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: openembedded-core
Hello,
this doesn't build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/107/builds/4674/steps/12/logs/stdio
| /usr/src/debug/libssh2/1.11.0-r0/tests/test_auth_keyboard_info_request.c:270: undefined reference to `userauth_keyboard_interactive_decode_info_request'
| collect2: error: ld returned 1 exit status
| make[3]: *** [Makefile:973: test_auth_keyboard_info_request] Error 1
https://autobuilder.yoctoproject.org/typhoon/#/builders/106/builds/6210/steps/12/logs/stdio
| /home/pokybuild/yocto-worker/beaglebone-alt/build/build/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/libssh2/1.11.0-r0/recipe-sysroot-native/usr/bin/arm-poky-linux-gnueabi/../../libexec/arm-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/13.1.1/ld: test_hostkey.o: in function `test':
| /usr/src/debug/libssh2/1.11.0-r0/tests/test_hostkey.c:43: undefined reference to `_libssh2_base64_decode'
| collect2: error: ld returned 1 exit status
| make[3]: Leaving directory '/home/pokybuild/yocto-worker/beaglebone-alt/build/build/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/libssh2/1.11.0-r0/build/tests'
| make[3]: *** [Makefile:1037: test_hostkey] Error 1
On 02/06/2023 22:34:52+0100, Sudip Mukherjee wrote:
> Changes:
> Update license checksum: change in copyright year.
> Remove patch fixed by upstream.
> Disable rpath, hardcoded rpath failed curl-native build.
> Adjust ptests.
>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
> .../libssh2/libssh2/fix-ssh2-test.patch | 23 -------------------
> .../recipes-support/libssh2/libssh2/run-ptest | 2 +-
> .../{libssh2_1.10.0.bb => libssh2_1.11.0.bb} | 16 ++++++++-----
> 3 files changed, 11 insertions(+), 30 deletions(-)
> delete mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
> rename meta/recipes-support/libssh2/{libssh2_1.10.0.bb => libssh2_1.11.0.bb} (67%)
>
> diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
> deleted file mode 100644
> index ee916c42d4..0000000000
> --- a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box,
> -so we need to re-enable them as a workaround for the test
> -suite until upstream updates the tests.
> -
> -See: https://github.com/libssh2/libssh2/issues/630
> -
> -Upstream-Status: Backport [alternative fixes merged upstream]
> -
> -Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5
> -
> ---- a/tests/ssh2.sh
> -+++ b/tests/ssh2.sh
> -@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host
> - -o 'Port 4711' \
> - -o 'Protocol 2' \
> - -o "AuthorizedKeysFile $srcdir/etc/user.pub" \
> -- -o 'UsePrivilegeSeparation no' \
> -+ -o 'HostKeyAlgorithms +ssh-rsa' \
> -+ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \
> - -o 'StrictModes no' \
> - -D \
> - $libssh2_sshd_params &
> -
> diff --git a/meta/recipes-support/libssh2/libssh2/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest
> index 5e7426f79d..ed87074fcd 100644
> --- a/meta/recipes-support/libssh2/libssh2/run-ptest
> +++ b/meta/recipes-support/libssh2/libssh2/run-ptest
> @@ -2,7 +2,7 @@
>
> ptestdir=$(dirname "$(readlink -f "$0")")
> cd tests
> -for test in simple mansyntax.sh ssh2.sh
> +for test in test_simple mansyntax.sh test_sshd.test
> do
> ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test
> done
> diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb
> similarity index 67%
> rename from meta/recipes-support/libssh2/libssh2_1.10.0.bb
> rename to meta/recipes-support/libssh2/libssh2_1.11.0.bb
> index d5513373b0..31a3c0c90b 100644
> --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb
> +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb
> @@ -5,20 +5,20 @@ SECTION = "libs"
> DEPENDS = "zlib"
>
> LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225"
>
> SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \
> - file://fix-ssh2-test.patch \
> file://run-ptest \
> "
>
> -SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51"
> +SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461"
>
> inherit autotools pkgconfig ptest
>
> EXTRA_OECONF += "\
> --with-libz \
> --with-libz-prefix=${STAGING_LIBDIR} \
> + --disable-rpath \
> "
>
> # only one of openssl and gcrypt could be set
> @@ -41,9 +41,13 @@ do_install_ptest() {
> install -d ${D}${PTEST_PATH}/tests
> install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/
> cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/
> - cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/
> - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/
> - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/
> + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/
> + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/
> + cp -rf ${S}/tests/test_sshd.test ${D}${PTEST_PATH}/tests/
> + cp -rf ${S}/tests/openssh_server ${D}${PTEST_PATH}/tests/
> + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/
> +# Makefile.inc required as test_sshd.test generates the list of test from this
> + cp -rf ${S}/tests/Makefile.inc ${D}${PTEST_PATH}/tests/
> mkdir -p ${D}${PTEST_PATH}/docs
> cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/
> }
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182343): https://lists.openembedded.org/g/openembedded-core/message/182343
> Mute This Topic: https://lists.openembedded.org/mt/99295530/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] libssh2: Upgrade to v1.11.0
2023-06-07 12:34 ` [OE-core] " Alexandre Belloni
@ 2023-06-11 20:43 ` Sudip Mukherjee
0 siblings, 0 replies; 3+ messages in thread
From: Sudip Mukherjee @ 2023-06-11 20:43 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: openembedded-core
On Wed, 7 Jun 2023 at 13:34, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello,
>
> this doesn't build:
Thanks for testing.
Surprisingly the failure is only with poky and builds fine with
oe-core (which is where I tested).
I am checking it now.
--
Regards
Sudip
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-11 20:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 21:34 [PATCH] libssh2: Upgrade to v1.11.0 Sudip Mukherjee
2023-06-07 12:34 ` [OE-core] " Alexandre Belloni
2023-06-11 20:43 ` Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).