diff --git a/.checkpackageignore b/.checkpackageignore index 3622341e74..7f54d8195d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -720,7 +720,6 @@ package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch lib_pa package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch lib_patch.Upstream package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch lib_patch.Upstream package/openrc/0006-Also-create-run-lock-subsys-directory.patch lib_patch.Upstream -package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch lib_patch.Upstream package/opentyrian/0001-Move-definitions-that-don-t-need-to-be-exposed-from-opl-h-to-opl-c.patch lib_patch.Upstream package/openvmtools/0001-no_cflags_werror.patch lib_patch.Upstream package/openvmtools/0002-dont-force-cppflags.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index fb1938b6e3..64112f97c5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.05" +config BR2_PACKAGE_OPENSWAN + bool "openswan removed" + select BR2_LEGACY + help + Openswan was no longer maintained upstream, so it has + been dropped. + config BR2_PACKAGE_RUBIX bool "rubix removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index dc68e1b912..774f77c106 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2577,7 +2577,6 @@ endif source "package/openobex/Config.in" source "package/openresolv/Config.in" source "package/openssh/Config.in" - source "package/openswan/Config.in" source "package/openvpn/Config.in" source "package/p910nd/Config.in" source "package/parprouted/Config.in" diff --git a/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch b/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch deleted file mode 100644 index ea50dd11ad..0000000000 --- a/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 66f8abe037970dda50fbc460edb2a2fa9f391d8a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 3 Aug 2022 19:14:25 +0200 -Subject: [PATCH] lib/libopenswan/constants.c: workaround missing ns_t_tkey - definition in uClibc < 1.0.41 - -Signed-off-by: Thomas Petazzoni ---- - lib/libopenswan/constants.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/libopenswan/constants.c b/lib/libopenswan/constants.c -index 90c973b5f..04e68da42 100644 ---- a/lib/libopenswan/constants.c -+++ b/lib/libopenswan/constants.c -@@ -1411,7 +1411,9 @@ static const char *const rr_qtype_name[] = { - NULL - }; - --enum_names rr_qtype_names = { ns_t_tkey, ns_t_any -+/* ns_t_tkey is 249, but its definition is missing from uClibc < -+ * 1.0.41, so let's hardcode it */ -+enum_names rr_qtype_names = { 249 /* ns_t_tkey */, ns_t_any - , rr_qtype_name, &rr_type_names }; - - static const char *const rr_class_name[] = { --- -2.37.1 - diff --git a/package/openswan/Config.in b/package/openswan/Config.in deleted file mode 100644 index 31c4a66b35..0000000000 --- a/package/openswan/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_OPENSWAN - bool "openswan" - depends on BR2_USE_MMU # iproute2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 - select BR2_PACKAGE_GMP - select BR2_PACKAGE_IPROUTE2 - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC - help - Openswan is an implementation of IPsec for Linux - - http://www.openswan.org - -comment "openswan needs a toolchain w/ headers >= 3.4" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 diff --git a/package/openswan/openswan.hash b/package/openswan/openswan.hash deleted file mode 100644 index 574009ebfb..0000000000 --- a/package/openswan/openswan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331 openswan-3.0.0.tar.gz -sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING -sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk deleted file mode 100644 index 64218810f8..0000000000 --- a/package/openswan/openswan.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# openswan -# -################################################################################ - -OPENSWAN_VERSION = 3.0.0 -OPENSWAN_SITE = $(call github,xelerance,Openswan,v$(OPENSWAN_VERSION)) -OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause -OPENSWAN_LICENSE_FILES = COPYING LICENSE -OPENSWAN_CPE_ID_VENDOR = xelerance - -OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2 -OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" POD2MAN="" XMLTO="" \ - USERCOMPILE="$(TARGET_CFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - USERLINK="$(TARGET_LDFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false \ - USE_NOMANINSTALL=true WERROR="" - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -OPENSWAN_DEPENDENCIES += libcurl -OPENSWAN_MAKE_OPTS += USE_LIBCURL=true -endif - -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -OPENSWAN_DEPENDENCIES += libxcrypt -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENSWAN_DEPENDENCIES += openssl -OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true -endif - -define OPENSWAN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(OPENSWAN_MAKE_OPTS) programs -endef - -define OPENSWAN_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package))