Skip to content

[pull] master from buildroot:master #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Feb 5, 2026
Merged

[pull] master from buildroot:master #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
766a6e5
package/strongswan: fix patch header
tperale Feb 5, 2026
8090d0e
package/strongswan: add Linux kernel options
wbx-github Feb 4, 2026
d6ce4e2
package/strongswan: update to 6.0.4
wbx-github Feb 4, 2026
94a817a
package/asterisk: bump to 22.8.1
wbx-github Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/asterisk/asterisk.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Locally computed
sha256 8a94650b6f348af1f1c9cce7ed3585d280f3a31b0d3820084a42b03712df95d5 asterisk-22.5.2.tar.gz
sha256 4f30af0695a0131fc091d85e7b91e22504609434b3fbd263898c7354d41959c9 asterisk-22.8.1.tar.gz

# Locally computed
sha256 58bb83cec4d431f48d006e455d821668450f8cf6b6c95f090def47062fa3a60c pjproject-2.15.1.tar.bz2
Expand Down
2 changes: 1 addition & 1 deletion package/asterisk/asterisk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

ASTERISK_VERSION = 22.5.2
ASTERISK_VERSION = 22.8.1
# Use the github mirror: it's an official mirror maintained by Digium, and
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
Expand Down
46 changes: 0 additions & 46 deletions package/strongswan/0001-eap_mschapv2_failure_request_len.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions package/strongswan/strongswan.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# From http://download.strongswan.org/strongswan-5.9.14.tar.bz2.md5
md5 21ca3fc7c18456405d03b77266ba630a strongswan-5.9.14.tar.bz2
# From http://download.strongswan.org/strongswan-6.0.4.tar.bz2.md5
md5 f6b78a99e95179b6a65df218d75da7ca strongswan-6.0.4.tar.bz2
# Calculated based on the hash above
sha256 728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678 strongswan-5.9.14.tar.bz2
sha256 79576bb61b9a406cea9eb73d0c565cc6254a6b6d2e7198f44758d2d7c61a7aec strongswan-6.0.4.tar.bz2
# Locally calculated
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE
16 changes: 13 additions & 3 deletions package/strongswan/strongswan.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
#
################################################################################

STRONGSWAN_VERSION = 5.9.14
STRONGSWAN_VERSION = 6.0.4
STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
STRONGSWAN_SITE = http://download.strongswan.org
STRONGSWAN_LICENSE = GPL-2.0+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_CPE_ID_VENDOR = strongswan
STRONGSWAN_DEPENDENCIES = host-pkgconf
STRONGSWAN_INSTALL_STAGING = YES
# 0001-eap_mschapv2_failure_request_len.patch
STRONGSWAN_IGNORE_CVES += CVE-2025-62291
STRONGSWAN_CONF_OPTS += \
--without-lib-prefix \
--enable-led \
Expand Down Expand Up @@ -114,4 +112,16 @@ STRONGSWAN_CONF_OPTS += \
--disable-connmark \
--disable-forecast

# bare minimum to start charon
define STRONGSWAN_LINUX_CONFIG_FIXUPS
$(call KCONFIG_ENABLE_OPT,CONFIG_INET)
$(call KCONFIG_ENABLE_OPT,CONFIG_NET)
$(call KCONFIG_ENABLE_OPT,CONFIG_NETLINK)
$(call KCONFIG_ENABLE_OPT,CONFIG_INET_AH)
$(call KCONFIG_ENABLE_OPT,CONFIG_INET_ESP)
$(call KCONFIG_ENABLE_OPT,CONFIG_XFRM)
$(call KCONFIG_ENABLE_OPT,CONFIG_XFRM_USER)
$(call KCONFIG_ENABLE_OPT,CONFIG_XFRM_INTERFACE)
endef

$(eval $(autotools-package))