From 51f97e176eb772710651f5f981785417b6acbcf8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 11 Jan 2023 14:25:39 +0100 Subject: [PATCH] firmware: start phasing out LibreSSL glue No longer able to select it from the GUI. CORE_FLAVOUR still exists but can be removed safely later on. --- Makefile | 4 +--- README.md | 1 - .../controllers/OPNsense/Core/Api/repositories/opnsense.xml | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a4a22f929..6359decee 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2022 Franco Fichtner +# Copyright (c) 2014-2023 Franco Fichtner # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -109,8 +109,6 @@ CORE_PYTHON_DOT= ${CORE_PYTHON:C/./&./1} .if "${CORE_FLAVOUR}" == OpenSSL CORE_REPOSITORY?= ${CORE_ABI}/latest -.elif "${CORE_FLAVOUR}" == LibreSSL -CORE_REPOSITORY?= ${CORE_ABI}/libressl .else CORE_REPOSITORY?= unsupported/${CORE_FLAVOUR:tl} .endif diff --git a/README.md b/README.md index 358a28ce9..1ca39d155 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,6 @@ Several OPTIONS exist to customise the package, e.g.: * CORE_DEPENDS: a list of required dependencies for the package * CORE_DEPENDS_ARCH: a list of special -required packages * CORE_ORIGIN: sets a FreeBSD compatible package/ports origin -* CORE_FLAVOUR: can be set to "OpenSSL" or "LibreSSL" * CORE_COMMENT: a short description of the package * CORE_MAINTAINER: email of the package maintainer * CORE_WWW: web url of the package diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/repositories/opnsense.xml b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/repositories/opnsense.xml index b1931005f..621facd62 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/repositories/opnsense.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/repositories/opnsense.xml @@ -102,10 +102,6 @@ (default) - - libressl - LibreSSL - latest OpenSSL