Fix sodium_compat 32bit (#16303)

Fix upstream stupidity.  They required 32bit in 2.0.0, but didn't mark it then released 2.0.1 to fix that, but didn't pull 2.0.0.
Add explicit requirement for <2.0 to avoid the whole mess for now.  But that means we'll have to fix it down the road again.
This commit is contained in:
Tony Murray 2024-08-20 01:33:52 -05:00 committed by GitHub
parent 5748ada02d
commit 39ca9eb25c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 12 deletions

View File

@ -45,6 +45,7 @@
"librenms/plugin-interfaces": "^1.0",
"mews/purifier": "^3.4",
"nunomaduro/laravel-console-summary": "^1.9",
"paragonie/sodium_compat": "<2.0",
"pear/console_color2": "^0.1",
"pear/console_table": "^1.3",
"pear/net_dns2": "^1.5",

24
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "dabb9a7876ed5d206fc8278729d2d417",
"content-hash": "cfd22f9b26f539a6adc0ee571737bfcf",
"packages": [
{
"name": "amenadiel/jpgraph",
@ -4041,28 +4041,28 @@
},
{
"name": "paragonie/sodium_compat",
"version": "v2.0.1",
"version": "v1.21.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
"reference": "f65c82939ab17aeff538f9bf6d582f65cc7f255e"
"reference": "bb312875dcdd20680419564fe42ba1d9564b9e37"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/f65c82939ab17aeff538f9bf6d582f65cc7f255e",
"reference": "f65c82939ab17aeff538f9bf6d582f65cc7f255e",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37",
"reference": "bb312875dcdd20680419564fe42ba1d9564b9e37",
"shasum": ""
},
"require": {
"php": "^8.1",
"php-64bit": "*"
"paragonie/random_compat": ">=1",
"php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
},
"require-dev": {
"phpunit/phpunit": "^7|^8|^9",
"vimeo/psalm": "^4|^5"
"phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
},
"suggest": {
"ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
"ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
"ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
},
"type": "library",
"autoload": {
@ -4121,9 +4121,9 @@
],
"support": {
"issues": "https://github.com/paragonie/sodium_compat/issues",
"source": "https://github.com/paragonie/sodium_compat/tree/v2.0.1"
"source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1"
},
"time": "2024-04-24T12:06:31+00:00"
"time": "2024-04-22T22:05:04+00:00"
},
{
"name": "pear/console_color2",