Created attachment 249834 [details] [PATCH] security/libsodium: Update 1.0.18 -> 1.0.19
I've done a mini-testrun for the ports directly depend on libsodium and all of them are find to build: audio/owntone audio/shairport-sync devel/fbthrift devel/folly devel/pijul dns/curvedns dns/dnscrypt-wrapper dns/dnsdist dns/gdnsd3 dns/unbound ftp/proftpd ftp/pure-ftpd games/0ad games/devilutionX games/warzone2100 graphics/drawpile irc/unreal mail/rspamd mail/rspamd-devel misc/adios2 multimedia/gstreamer1-plugins-rust net-im/mtxclient net-im/py-toxcore-c net-im/qTox net-im/tox net-im/tox_extension_messages net-im/toxext net-im/toxins net-im/uTox net-p2p/c-lightning net-p2p/monero-cli net/eternalterminal net/fb303 net/fbzmq net/landrop net/libzmq4 net/megacmd net/mlvpn net/mvfst net/ntopng net/openldap25-server net/openldap26-server net/pichi net/remmina net/rosenpass net/shadowsocks-libev net/wangle security/fizz security/hpenc security/keysmith security/kickpass security/libsodium security/libuecc security/minisign security/mkp224o security/p5-Crypt-Sodium security/pecl-libsodium security/py-libnacl security/py-pynacl security/py-pysodium security/R-cran-sodium security/reop security/rubygem-rbnacl security/rubygem-rbnacl-libsodium security/softether5 sysutils/bupstash sysutils/fwup sysutils/nix www/dpp www/garage www/proxygen www/sogo
I guess ports bump is not required according to semver logic in this case.
Or no, I think it is required as .so version has changed :(
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b66e4949cb23218adc602edc35db187f966c5377 commit b66e4949cb23218adc602edc35db187f966c5377 Author: Vsevolod Stakhov <vsevolod@FreeBSD.org> AuthorDate: 2024-05-20 10:29:56 +0000 Commit: Vsevolod Stakhov <vsevolod@FreeBSD.org> CommitDate: 2024-05-20 10:33:03 +0000 security/libsodium: update to 1.0.19, bump dependent ports PR: 278259 Reported by: Andrey Korobkov <alster-vinterdalen.se> astro/py-metpy/Makefile | 1 + audio/owntone/Makefile | 2 +- audio/py-librosa/Makefile | 1 + audio/shairport-sync/Makefile | 2 +- benchmarks/py-locust/Makefile | 1 + benchmarks/py-zopkio/Makefile | 2 +- cad/horizon-eda/Makefile | 1 + comms/gnuradio/Makefile | 2 +- comms/gqrx/Makefile | 1 + comms/gr-osmosdr/Makefile | 2 +- databases/proftpd-mod_sql_mysql/Makefile | 1 + databases/proftpd-mod_sql_odbc/Makefile | 1 + databases/proftpd-mod_sql_postgres/Makefile | 2 +- databases/proftpd-mod_sql_sqlite/Makefile | 2 +- databases/proftpd-mod_sql_tds/Makefile | 2 +- devel/fbthrift/Makefile | 1 + devel/folly/Makefile | 1 + devel/p5-Test-OpenLDAP/Makefile | 1 + devel/pijul/Makefile | 2 +- devel/py-PyGithub/Makefile | 2 +- devel/py-buildbot-worker/Makefile | 1 + devel/py-buildbot/Makefile | 1 + devel/py-dockerpty/Makefile | 1 + devel/py-fabric/Makefile | 1 + devel/py-ipydatawidgets/Makefile | 1 + devel/py-ipykernel/Makefile | 1 + devel/py-ipympl/Makefile | 2 +- devel/py-ipyparallel/Makefile | 2 +- devel/py-ipywidgets/Makefile | 1 + devel/py-jupyter-client/Makefile | 2 +- devel/py-jupyter-collaboration/Makefile | 1 + devel/py-jupyter-kernel-test/Makefile | 1 + devel/py-jupyter-lsp/Makefile | 1 + devel/py-jupyter-server-fileid/Makefile | 1 + devel/py-jupyter-server-mathjax/Makefile | 2 +- devel/py-jupyter-server/Makefile | 1 + devel/py-jupyter_console/Makefile | 1 + devel/py-jupyterlab-lsp/Makefile | 2 +- devel/py-jupyterlab-server/Makefile | 1 + devel/py-jupyterlab-widgets/Makefile | 1 + devel/py-jupyterlab/Makefile | 1 + devel/py-jupyterlab_launcher/Makefile | 2 +- devel/py-nbclassic/Makefile | 2 +- devel/py-nbclient/Makefile | 1 + devel/py-nbconvert/Makefile | 1 + devel/py-nbdime/Makefile | 1 + devel/py-nbval/Makefile | 1 + devel/py-notebook-shim/Makefile | 1 + devel/py-pooch/Makefile | 1 + devel/py-pyquil/Makefile | 2 +- devel/py-pytest-jupyter/Makefile | 1 + devel/py-qtconsole/Makefile | 1 + devel/py-rpcq/Makefile | 2 +- devel/py-spyder-kernels/Makefile | 1 + devel/py-spyder-unittest/Makefile | 1 + devel/py-threema-msgapi/Makefile | 1 + devel/py-weasel/Makefile | 1 + devel/spyder/Makefile | 1 + devel/xeus-cling/Makefile | 2 +- devel/xeus-zmq/Makefile | 1 + dns/curvedns/Makefile | 2 +- dns/dnscrypt-wrapper/Makefile | 2 +- dns/dnsdist/Makefile | 1 + dns/dnstable-convert/Makefile | 2 +- dns/dnsviz/Makefile | 2 +- dns/gdnsd3/Makefile | 2 +- dns/getdns/Makefile | 2 +- dns/luaunbound/Makefile | 2 +- dns/unbound/Makefile | 1 + finance/nextcloud-cospend/Makefile | 1 + finance/py-python-obelisk/Makefile | 2 +- ftp/proftpd-mod_vroot/Makefile | 2 +- ftp/proftpd/Makefile | 2 +- ftp/pure-ftpd/Makefile | 1 + ftp/py-sftp/Makefile | 1 + games/0ad/Makefile | 2 +- games/devilutionX/Makefile | 1 + games/warzone2100/Makefile | 1 + graphics/drawpile/Makefile | 2 +- graphics/rapid-photo-downloader/Makefile | 2 +- irc/unreal/Makefile | 1 + mail/mailman3/Makefile | 2 +- mail/milter-greylist/Makefile | 2 +- mail/nextcloud-mail/Makefile | 1 + mail/opendkim/Makefile | 2 +- mail/p5-Mail-OpenDKIM/Makefile | 1 + mail/py-afew/Makefile | 2 +- mail/py-authheaders/Makefile | 1 + mail/py-dkimpy-milter/Makefile | 1 + mail/py-dkimpy/Makefile | 2 +- mail/py-fuglu/Makefile | 1 + mail/rmilter/Makefile | 1 + mail/rspamd-devel/Makefile | 2 +- mail/rspamd/Makefile | 1 + mail/snappymail/Makefile | 1 + math/mathicsscript/Makefile | 2 +- math/octave-forge-tablicious/Makefile | 2 +- math/octave-forge-zeromq/Makefile | 2 +- math/octave-forge/Makefile | 2 +- math/py-mathics/Makefile | 2 +- math/py-pyodesys/Makefile | 1 + math/py-yt/Makefile | 1 + math/sage/Makefile | 2 +- misc/adios2/Makefile | 2 +- misc/py-cinder/Makefile | 2 +- misc/py-ipyfastscape/Makefile | 2 +- misc/py-molequeue/Makefile | 2 +- misc/py-orange3-network/Makefile | 2 +- misc/py-papermill/Makefile | 1 + misc/py-toil/Makefile | 1 + misc/snakemake/Makefile | 2 +- misc/urh/Makefile | 1 + multimedia/gstreamer1-plugins-rust/Makefile | 2 +- multimedia/kooha/Makefile | 2 +- multimedia/libopenshot/Makefile | 2 +- multimedia/openshot/Makefile | 2 +- net-im/jitsi-meet-full/Makefile | 1 + net-im/jitsi-prosody-plugins/Makefile | 1 + net-im/mtxclient/Makefile | 2 +- net-im/nextcloud-talk/Makefile | 1 + net-im/nheko/Makefile | 2 +- net-im/prosody-modules/Makefile | 1 + net-im/prosody/Makefile | 2 +- net-im/py-matrix-synapse/Makefile | 2 +- net-im/py-toxcore-c/Makefile | 2 +- net-im/py-unmessage/Makefile | 2 +- net-im/qTox/Makefile | 2 +- net-im/tox/Makefile | 1 + net-im/tox_extension_messages/Makefile | 2 +- net-im/toxbot/Makefile | 2 +- net-im/toxext/Makefile | 2 +- net-im/toxic/Makefile | 1 + net-im/toxins/Makefile | 2 +- net-im/uTox/Makefile | 2 +- net-mgmt/py-junos-eznc/Makefile | 1 + net-mgmt/py-napalm-logs/Makefile | 1 + net-mgmt/py-napalm/Makefile | 1 + net-mgmt/py-ncclient/Makefile | 1 + net-mgmt/py-nxapi-plumbing/Makefile | 1 + net-mgmt/py-pyIOSXR/Makefile | 1 + net-mgmt/py-pynxos/Makefile | 1 + net-p2p/bitcoin/Makefile | 1 + net-p2p/bitmark-cli/Makefile | 2 +- net-p2p/bitmark-daemon/Makefile | 2 +- net-p2p/bitmark-recorder/Makefile | 2 +- net-p2p/bitmark/Makefile | 2 +- net-p2p/c-lightning/Makefile | 1 + net-p2p/clboss/Makefile | 1 + net-p2p/litecoin/Makefile | 1 + net-p2p/monero-cli/Makefile | 2 +- net/axa/Makefile | 2 +- net/cppzmq/Makefile | 1 + net/czmq/Makefile | 1 + net/czmq4/Makefile | 2 +- net/eternalterminal/Makefile | 1 + net/fb303/Makefile | 1 + net/fbzmq/Makefile | 2 +- net/landrop/Makefile | 1 + net/libzmq4/Makefile | 2 +- net/megacmd/Makefile | 2 +- net/mlvpn/Makefile | 2 +- net/mvfst/Makefile | 1 + net/nmsg/Makefile | 2 +- net/ntopng/Makefile | 1 + net/openldap25-server/Makefile | 2 +- net/openldap26-server/Makefile | 2 +- net/p5-Net-Nmsg/Makefile | 2 +- net/p5-ZMQ-FFI/Makefile | 1 + net/pichi/Makefile | 1 + net/proftpd-mod_ldap/Makefile | 2 +- net/py-magic-wormhole/Makefile | 1 + net/py-pynmsg/Makefile | 2 +- net/py-pyzmq/Makefile | 1 + net/py-saltyrtc.server/Makefile | 2 +- net/py-smart-open/Makefile | 1 + net/py-sshtunnel/Makefile | 1 + net/remmina/Makefile | 2 +- net/rosenpass/Makefile | 2 +- net/ryu/Makefile | 2 +- net/shadowsocks-libev/Makefile | 2 +- net/sie-nmsg/Makefile | 2 +- net/wangle/Makefile | 1 + net/zyre/Makefile | 1 + science/agrum/Makefile | 1 + science/psi4/Makefile | 1 + science/py-atomium/Makefile | 2 +- science/py-chempy/Makefile | 1 + science/py-cirq-rigetti/Makefile | 1 + science/py-ipygany/Makefile | 2 +- science/py-jupyter_jsmol/Makefile | 1 + science/py-optking/Makefile | 2 +- science/py-qcelemental/Makefile | 1 + science/py-qcengine/Makefile | 1 + security/R-cran-sodium/Makefile | 1 + security/authenticator/Makefile | 2 +- security/caldera-ot/Makefile | 2 +- security/caldera/Makefile | 2 +- security/caldera4/Makefile | 2 +- security/fizz/Makefile | 1 + security/gvm/Makefile | 1 + security/hpenc/Makefile | 2 +- security/keysmith/Makefile | 1 + security/kickpass/Makefile | 2 +- security/libreswan/Makefile | 2 +- security/libsodium/Makefile | 6 ++++-- security/libsodium/distinfo | 6 +++--- security/libsodium/pkg-plist | 8 ++++++-- security/libuecc/Makefile | 2 +- security/minisign/Makefile | 1 + security/mkp224o/Makefile | 1 + security/nextcloud-end_to_end_encryption/Makefile | 1 + security/nextcloud-passman/Makefile | 1 + security/nextcloud-twofactor_admin/Makefile | 1 + security/nextcloud-twofactor_nextcloud_notification/Makefile | 1 + security/nextcloud-twofactor_webauthn/Makefile | 1 + security/p5-Crypt-Sodium/Makefile | 2 +- security/pecl-libsodium/Makefile | 1 + security/php81-sodium/Makefile | 1 + security/php82-sodium/Makefile | 1 + security/php83-sodium/Makefile | 1 + security/proftpd-mod_clamav/Makefile | 2 +- security/py-aiohttp-security/Makefile | 1 + security/py-exscript/Makefile | 1 + security/py-libnacl/Makefile | 1 + security/py-netmiko/Makefile | 1 + security/py-onlykey/Makefile | 2 +- security/py-ospd-openvas/Makefile | 1 + security/py-paramiko/Makefile | 2 +- security/py-plaso/Makefile | 2 +- security/py-pwntools/Makefile | 2 +- security/py-pyaff4/Makefile | 2 +- security/py-pyaxo/Makefile | 2 +- security/py-pymacaroons/Makefile | 2 +- security/py-pynacl/Makefile | 1 + security/py-pysodium/Makefile | 2 +- security/py-scp/Makefile | 1 + security/py-securesystemslib/Makefile | 1 + security/py-signedjson/Makefile | 2 +- security/py-tuf/Makefile | 1 + security/reop/Makefile | 2 +- security/rubygem-rbnacl-libsodium/Makefile | 1 + security/rubygem-rbnacl/Makefile | 1 + security/softether5/Makefile | 1 + sysutils/bupstash/Makefile | 2 +- sysutils/docker-compose/Makefile | 2 +- sysutils/duplicity/Makefile | 1 + sysutils/duply/Makefile | 1 + sysutils/froxlor/Makefile | 1 + sysutils/fwup/Makefile | 2 +- sysutils/jadm/Makefile | 2 +- sysutils/nix/Makefile | 1 + sysutils/omnibackup/Makefile | 1 + sysutils/py-azure-cli-acr/Makefile | 1 + sysutils/py-azure-cli-core/Makefile | 1 + sysutils/py-azure-cli/Makefile | 1 + sysutils/py-docker/Makefile | 1 + sysutils/py-howdoi/Makefile | 2 +- sysutils/py-keep/Makefile | 1 + sysutils/py-ploy/Makefile | 1 + sysutils/py-ploy_ezjail/Makefile | 1 + sysutils/py-salt/Makefile | 1 + sysutils/rubygem-smart_proxy_salt/Makefile | 1 + textproc/py-gensim/Makefile | 1 + textproc/py-jupyter_sphinx/Makefile | 1 + textproc/py-nbsphinx/Makefile | 1 + textproc/py-orange3-text/Makefile | 2 +- textproc/py-sense2vec/Makefile | 1 + textproc/py-spacy-llm/Makefile | 2 +- textproc/py-spacy/Makefile | 2 +- www/dpp/Makefile | 1 + www/garage/Makefile | 1 + www/glpi/Makefile | 1 + www/moodle41/Makefile | 1 + www/moodle42/Makefile | 1 + www/moodle43/Makefile | 1 + www/moodle44/Makefile | 1 + www/nextcloud-appointments/Makefile | 1 + www/nextcloud-calendar/Makefile | 1 + www/nextcloud-contacts/Makefile | 1 + www/nextcloud-deck/Makefile | 1 + www/nextcloud-forms/Makefile | 1 + www/nextcloud-groupfolders/Makefile | 1 + www/nextcloud-notes/Makefile | 1 + www/nextcloud-tasks/Makefile | 1 + www/nextcloud/Makefile | 1 + www/onionshare-cli/Makefile | 1 + www/onionshare/Makefile | 2 +- www/piwigo/Makefile | 2 +- www/proxygen/Makefile | 1 + www/py-aiohttp-session/Makefile | 1 + www/py-autobahn/Makefile | 2 +- www/py-daphne/Makefile | 1 + www/py-notebook/Makefile | 1 + www/sogo/Makefile | 1 + www/varnish-libvmod-dynamic/Makefile | 2 +- www/web2ldap/Makefile | 1 + x11/xpra/Makefile | 1 + 297 files changed, 307 insertions(+), 132 deletions(-)
Created attachment 250877 [details] Use git commit with fixes for arm64 crypto
Hi everyone, since version 1.0.19 libsodium will not build for at least some arm64/aarch64 devices: In file included from crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c:35: /usr/lib/clang/18/include/arm_neon.h:62502:32: error: always_inline function 'vget_high_p64' requires target feature 'crypto', but would be inlined into function 'vmull_high_p64' that is compiled without support for 'crypto' 62502 | __ret = vmull_p64((poly64_t)(vget_high_p64(__p0)), (poly64_t)(vget_high_p64(__p1))); The fixes for this seem to have been included over a period of several months so I used the latest git commit from the stable branch. Please feel free to use any more conservative commit :-) Also not sure if this warrants a version tweak?
Comment on attachment 250877 [details] Use git commit with fixes for arm64 crypto I think it is better to get this patch locally, as it won't be the official release otherwise.
(In reply to Vsevolod Stakhov from comment #8) Hello, Yep, it fails on aarch64. There's no need to switch to GH, just fetch https://github.com/jedisct1/libsodium/commit/fb4533b0a941b3a5b1db5687d1b008a5853d1f29.patch . Tomorrow I can take a look at it. Thanks
(In reply to Nuno Teixeira from comment #9) (...) e.g., PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= cffa0cee9f5897fbd96a3621f2c0dc8aeb90e711.patch:-p1 And check if it applies. If not, then apply or make changes manually in WRKSRC and `make makepatch` GH_ACCOUNT and GH_PROJECT needs to be changed to real values since those vars are no defined in port.
(In reply to Nuno Teixeira from comment #10) (...) Real values: PATCH_SITES= https://github.com/jedisct1/libsodium/commit/ PATCHFILES= fb4533b0a941b3a5b1db5687d1b008a5853d1f29.patch:-p1 and `make makesum`.
(In reply to Nuno Teixeira from comment #11) Strange that fb4533b0 fix is already included in 1.0.19... Any clues?
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d1bb5a67c34515d2d7b50700a23937afccc811f commit 3d1bb5a67c34515d2d7b50700a23937afccc811f Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-05-24 09:58:42 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-05-24 10:02:59 +0000 security/libsodium: Fix aarch64 build Apply upstream patch to fix build on aarch64 PR: 278259 Reported by: Thierry Dussuet <thierry.dussuet@protonmail.com> Approved by: portmgr (blanket) security/libsodium/Makefile | 3 +++ security/libsodium/distinfo | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)
Meanwhile, 1.0.20 is out. Patch at bug279347