diff --git a/.checkpackageignore b/.checkpackageignore index 2c9d62fe49..c4bc3e5c02 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -523,7 +523,6 @@ package/libavl/0001-fix-makefile.patch lib_patch.Upstream package/libb64/0001-Integer-overflows.patch lib_patch.Upstream package/libb64/0002-Initialize-C++-objects.patch lib_patch.Upstream package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream -package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index ff0549548d..3ce540561f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2026.02" +config BR2_PACKAGE_LIBCGI + bool "libcgi has been removed" + select BR2_LEGACY + help + libcgi is unmaintained and has been removed + config BR2_PACKAGE_LET_ME_CREATE bool "let-me-create has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 5c337c0eb5..58905f4759 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2032,7 +2032,6 @@ menu "Networking" source "package/gupnp-dlna/Config.in" source "package/ibrcommon/Config.in" source "package/ibrdtn/Config.in" - source "package/libcgi/Config.in" source "package/libcgicc/Config.in" source "package/libcoap/Config.in" source "package/libcpprestsdk/Config.in" diff --git a/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch b/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch deleted file mode 100644 index 3ec674ae70..0000000000 --- a/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 15ec267520efbe45193eb1df5361a4ab56164294 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 8 May 2022 17:54:42 +0200 -Subject: [PATCH] CMakeLists.txt: honour BUILD_TESTING - -Allow the user to disable tests through the standard BUILD_TESTING -option: https://cmake.org/cmake/help/latest/module/CTest.html - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rafaelsteil/libcgi/commit/15ec267520efbe45193eb1df5361a4ab56164294] ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbf0d97..e3329a1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,15 +29,21 @@ option(BUILD_SHARED_LIBS - "Global flag to cause add_library to create shared libraries if on." - ON - ) -+option(BUILD_TESTING -+ "Build tests." -+ ON -+) - - # subdirectories - add_subdirectory("include/libcgi") - add_subdirectory("src") - - # test --enable_testing() --include(CTest) --add_subdirectory("test") -+if(BUILD_TESTING) -+ enable_testing() -+ include(CTest) -+ add_subdirectory("test") -+endif(BUILD_TESTING) - - # cmake package stuff - configure_package_config_file(${PROJECT_NAME_LC}-config.cmake.in diff --git a/package/libcgi/Config.in b/package/libcgi/Config.in deleted file mode 100644 index 33369079b3..0000000000 --- a/package/libcgi/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBCGI - bool "libcgi" - help - LibCGI is a library written from scratch to easily make - CGI applications in C. - - There are a lot of functions like string manipulation, - session and cookie support, GET and POST methods manipulation - etc..., to help you to quickly write powerful CGI programs. - - https://github.com/rafaelsteil/libcgi/ diff --git a/package/libcgi/libcgi.hash b/package/libcgi/libcgi.hash deleted file mode 100644 index 5e8845ede2..0000000000 --- a/package/libcgi/libcgi.hash +++ /dev/null @@ -1,8 +0,0 @@ -# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.md5 -md5 6efdc968bdf986832b7e220d1b914e57 libcgi-1.3.0.tar.gz -# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.sha256 -sha256 d932f380b1a5dbfbddffaa76fac71bf505a9585d441c9ae86bfbf76033d9d8df libcgi-1.3.0.tar.gz - -# Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1.txt -sha256 f32c31e26ec840753a8cd47cd2681e48be4cee853212d16a4b1d85ac4d677669 LICENSES/MIT.txt diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk deleted file mode 100644 index 22163310d3..0000000000 --- a/package/libcgi/libcgi.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libcgi -# -################################################################################ - -LIBCGI_VERSION = 1.3.0 -LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION) - -LIBCGI_INSTALL_STAGING = YES -LIBCGI_LICENSE = LGPL-2.1+, MIT (base64.c) -LIBCGI_LICENSE_FILES = LICENSES/LGPL-2.1.txt LICENSES/MIT.txt - -$(eval $(cmake-package))