package/fastd: bump to v19
PATCH 1/1 package/fastd: bump to v19
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
https://fastd.readthedocs.io/en/stable/releases/v19.html
Two patches went upstream. The last remaining patch was not touched, LTO might not work as expected, but upstream dropped CMake in favour of the meson build system after v19, so it seemed not worth the effort.
--- ...akeList-do-not-overwrite-module-path.patch | 56 ------- ...emove-aes128-ctr-NaCl-implementation.patch | 137 ------------------ package/fastd/fastd.hash | 4 +- package/fastd/fastd.mk | 4 +- 4 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch delete mode 100644 package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch deleted +0 -56
@@ -1,56 +0,0 @@ -From a925a4cab1b722a2a24b0c1d2a1925f3b766de61 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -Date: Thu, 2 Mar 2017 21:43:39 +0100 -Subject: [PATCH] CMakeList: do not overwrite module path - -Currently, the CMakeList.txt completely overwrites the CMAKE_MODULE_PATH -variable. - -This is problematic when an upper-layer buildsystem wants to set its own -module path to use custom modules. - -For example, Buldroot [0] provides a custom platform description [1] to fix -cross-compilation issue. Overwriting the module path means that this -custom platform description is not found [2]. - -Providing such a custom platform description is what the upstream cmake -devs suggest [3], quoting: - - If a toolchain file specifies CMAKE_SYSTEM_NAME such that a custom - `Platform/MySystem.cmake` file is loaded then the latter can set - them [*] as needed for the target platform. - -[*] offending settings causing RPATH issues during cross-compilation. - -So we need to append our source tree to the module path, not replace it -blindly. - -[0] https://buildroot.org/ -[1] https://git.buildroot.org/buildroot/tree/support/misc/Buildroot.cmake -[2] http://autobuild.buildroot.net/results/69f/69fb2e3b549a069e2898506db918423e6742c589/build-end.log -[3] http://public.kitware.com/pipermail/cmake/2017-February/065063.html - -Signed-off-by: "Yann E. MORIN" <[email protected]> ---- -Patch applied upstream: -https://git.universe-factory.net/fastd/commit/?id=a925a4cab1b722a2a24b0c1d2a1925f3b766de61 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61689b1..2c9c61a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8.8) - --set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - cmake_policy(SET CMP0017 OLD) # Prefer modules in our module directory - - project(FASTD C ASM) --- -2.7.4 -
package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch deleted +0 -137
137 lines not on this page · raw message
package/fastd/fastd.hash +1 -3
@@ -1,5 +1,3 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 e53236d3049f64f7955ad9556da099eb fastd-18.tar.xz # computed locally -sha256 714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 fastd-18.tar.xz +sha256 6054608e2103b634c9d19ecd1ae058d4ec694747047130719db180578729783a fastd-19.tar.xz sha256 c3095dd0adffc03eaeba9c7cd81f06962ef4797a836e49468b3dccc2802ff904 COPYRIGHT
package/fastd/fastd.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -FASTD_VERSION = 18 -FASTD_SITE = https://projects.universe-factory.net/attachments/download/86 +FASTD_VERSION = 19 +FASTD_SITE = https://github.com/NeoRaider/fastd/releases/download/v$(FASTD_VERSION) FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz FASTD_LICENSE = BSD-2-Clause FASTD_LICENSE_FILES = COPYRIGHT
Signature · 1 line
2.20.1
PATCH 1/1 package/fastd: bump to v19
Quoted 10 lines · On Thu, 11 Jun 2020 21:25:04 +0200 Alexander Dahl <[email protected]> wrote:
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
https://fastd.readthedocs.io/en/stable/releases/v19.html
Two patches went upstream. The last remaining patch was not touched, LTO might not work as expected, but upstream dropped CMake in favour of the meson build system after v19, so it seemed not worth the effort.
Signed-off-by Alexander Dahl <[email protected]>
Quoted 8 lines
--- ...akeList-do-not-overwrite-module-path.patch | 56 ------- ...emove-aes128-ctr-NaCl-implementation.patch | 137 ------------------ package/fastd/fastd.hash | 4 +- package/fastd/fastd.mk | 4 +- 4 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch delete mode 100644 package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
You had forgotten to update the hash of the license file (and explain why it needs to be updated). I fixed that and applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/fastd: bump to v19
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Thu, 11 Jun 2020 21:25:04 +0200 Alexander Dahl <[email protected]> wrote:
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
https://fastd.readthedocs.io/en/stable/releases/v19.html
Two patches went upstream. The last remaining patch was not touched, LTO might not work as expected, but upstream dropped CMake in favour of the meson build system after v19, so it seemed not worth the effort.
Signed-off-by Alexander Dahl <[email protected]>Quoted 8 lines
--- ...akeList-do-not-overwrite-module-path.patch | 56 ------- ...emove-aes128-ctr-NaCl-implementation.patch | 137 ------------------ package/fastd/fastd.hash | 4 +- package/fastd/fastd.mk | 4 +- 4 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch delete mode 100644 package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
Quoted 2 lines
You had forgotten to update the hash of the license file (and explain why it needs to be updated). I fixed that and applied. Thanks!
I did not really forget it, but there was no error or warning on mismatch on my side. Maybe I did not let the whole BSP build finish, but just called some intermediate state before that was checked. Will check next time. Thanks for fixing it.
Greets
Alex
Signature · 11 lines
/"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200619/d272f1d2/attachment.asc>
PATCH 1/1 package/fastd: bump to v19
Hello Alexander,
Quoted 7 lines · On Fri, 19 Jun 2020 00:15:59 +0200 Alexander Dahl <[email protected]> wrote:
Quoted 2 lines
You had forgotten to update the hash of the license file (and explain why it needs to be updated). I fixed that and applied. Thanks!
I did not really forget it, but there was no error or warning on mismatch on my side. Maybe I did not let the whole BSP build finish, but just called some intermediate state before that was checked. Will check next time. Thanks for fixing it.
The hash of license files is checked when you run:
$ make legal-info
or if you want to do it just for one package:
$ make <pkg>-legal-info
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/fastd: bump to v19
In reply to Alexander DahlQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Dahl <[email protected]> writes:
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
Does this mean that fastd 18 is broken with openssl 1.1?, E.G. does this need to be backported to 2020.02.x?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/fastd: bump to v19
Hei hei,
just returning from two weeks holiday ?
Quoted 9 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Dahl <[email protected]> writes:
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
Does this mean that fastd 18 is broken with openssl 1.1?, E.G. does this need to be backported to 2020.02.x?
From the top of my head, I would say no. It probably means fastd is supposed to work with OpenSSL 1.1 or later now? It would have caused build errors against OpenSSL 1.1 in the past, if that would not have been the case, right?
I put upstream in Cc, maybe he can answer this?
Greets
Alex
Signature · 11 lines
/"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200727/94fa8c20/attachment.asc>
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 package/fastd: bump to v19
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthias" == Matthias Schiffer <[email protected]> writes:
Quoted 20 lines · Alexander Dahl
Hei hei,
just returning from two weeks holiday ?
Quoted 9 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Dahl <[email protected]> writes:
Maintenance release, most important is OpenSSL 1.1+ support. See full release notes for details:
Does this mean that fastd 18 is broken with openssl 1.1?, E.G. does this need to be backported to 2020.02.x?
From the top of my head, I would say no. It probably means fastd is supposed to work with OpenSSL 1.1 or later now? It would have caused build errors against OpenSSL 1.1 in the past, if that would not have been the case, right?
Quoted 5 lines
I put upstream in Cc, maybe he can answer this?
Greets
Alex
Quoted 5 lines
fastd 18 does not build against OpenSSL 1.1 without additional patches (which had been backported to many desktop distributions).
At a glance, it looks like the buildroot fastd v18 package should not compile when
BR2_PACKAGE_OPENSSLis set.
Hmm, it does on 2020.02.x:
Quoted 1 line
Quoted 1 line
Quoted 1 line
libopenssl 1.1.1g Installing to target
..
Quoted 1 line
Quoted 1 line
Quoted 1 line
fastd 18 Configuring
(mkdir -p /home/peko/source/buildroot/output-fastd/build/fastd-18/ && cd /home/peko/source/buildroot/output-fastd/build/fastd-18/ && rm -f CMakeCache.txt && PATH="/home/peko/source/buildroot/output-fastd/host/bin:/home/peko/source/buildroot/output-fastd/host/sbin:/home/peko/bin:/home/peko/.local/bin:/home/peko/bin:/home/peko/.local/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" /usr/bin/cmake /home/peko/source/buildroot/output-fastd/build/fastd-18/ -DCMAKE_TOOLCHAIN_FILE="/home/peko/source/buildroot/output-fastd/host/share/buildroot/toolchainfile.cmake" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_COLOR_MAKEFILE=OFF -DBUILD_DOC=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLE=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF -DBUILD_TESTS=OFF -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON -DENABLE_LIBSODIUM=ON -DENABLE_OPENSSL=ON -DWITH_STATUS_SOCKET=ON -DENABLE_SYSTEMD=OFF -DENABLE_LTO=OFF ) ..
Quoted 1 line
Quoted 1 line
Quoted 1 line
fastd 18 Building
../home/peko/source/buildroot/output-fastd/build/fastd-18/src/fastd.c: In function ?init_config?:/home/peko/source/buildroot/output-fastd/build/fastd-18/src/fastd.c:506:2: warning: ?OPENSSL_config? is deprecated [-Wdeprecated-declarations]
OPENSSL_config(NULL);
^
In file included from /home/peko/source/buildroot/output-fastd/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/openssl/e_os2.h:13:0,
from /home/peko/source/buildroot/output-fastd/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/openssl/bio.h:13, from /home/peko/source/buildroot/output-fastd/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/openssl/conf.h:13, from /home/peko/source/buildroot/output-fastd/build/fastd-18/src/fastd.c:58:/home/peko/source/buildroot/output-fastd/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/openssl/conf.h:91:1: note: declared here
DEPRECATEDIN_1_1_0(void OPENSSL_config(const char *config_name))
^
..
[100%] Linking C executable fastd
[100%] Built target fastd
I take it you are referring to this change for openssl 1.1 support?
https://github.com/NeoRaider/fastd/commit/8505374ee208d51a39e7b22846f9b781b9ccb452
But EVP_EncryptInit() is still available in 1.1.x:
nm target/usr/lib/libcrypto.a | grep 'EVP_EncryptInit$' 00000ef0 T EVP_EncryptInit
As described in the documentation:
The functions EVP_EncryptInit(), EVP_EncryptFinal(), EVP_DecryptInit(), EVP_CipherInit() and EVP_CipherFinal() are obsolete but are retained for compatibility with existing code
https://www.openssl.org/docs/man1.1.0/man3/EVP_EncryptInit.html
Signature · 1 line
Bye, Peter Korsgaard