opensourcemirror
/
opnsense-plugins
mirror of https://github.com/opnsense/plugins.git
1
0
Fork 0
Code Issues Releases Wiki Activity

plugins: remove PLUGIN_FLAVOUR handling and related LibreSSL bits

This commit is contained in:
Franco Fichtner 2023-02-07 09:34:11 +01:00
parent 2e1d61e301
commit 38a172b488
8 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Mk/defaults.mk
View File

@ -39,18 +39,6 @@ GITVERSION= ${SCRIPTSDIR}/version.sh
_PLUGIN_ARCH!= uname -p
PLUGIN_ARCH?= ${_PLUGIN_ARCH}
OPENSSL?= ${LOCALBASE}/bin/openssl
.if ! defined(PLUGIN_FLAVOUR)
.if exists(${OPENSSL})
_PLUGIN_FLAVOUR!= ${OPENSSL} version
PLUGIN_FLAVOUR?= ${_PLUGIN_FLAVOUR:[1]}
.else
.warning "Detected 'Base' flavour is not currently supported"
PLUGIN_FLAVOUR?= Base
.endif
.endif
VERSIONBIN= ${LOCALBASE}/sbin/opnsense-version
.if exists(${VERSIONBIN})
@ -83,7 +71,6 @@ PLUGIN_PYTHON?= ${_PLUGIN_PYTHON:[2]:S/./ /g:[1..2]:tW:S/ //}
REPLACEMENTS= PLUGIN_ABI \
PLUGIN_ARCH \
PLUGIN_FLAVOUR \
PLUGIN_HASH \
PLUGIN_MAINTAINER \
PLUGIN_NAME \

1
Templates/version
View File

@ -2,7 +2,6 @@
"product_abi": "%%PLUGIN_ABI%%",
"product_arch": "%%PLUGIN_ARCH%%",
"product_email": "%%PLUGIN_MAINTAINER%%",
"product_flavour": "%%PLUGIN_FLAVOUR%%",
"product_hash": "%%PLUGIN_HASH%%",
"product_id": "%%PLUGIN_PKGNAME%%",
"product_name": "%%PLUGIN_NAME%%",

1
net/haproxy/Makefile
View File

@ -1,5 +1,6 @@
PLUGIN_NAME= haproxy
PLUGIN_VERSION= 4.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy26
PLUGIN_MAINTAINER= opnsense@moov.de

8
net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
View File

@ -1050,11 +1050,7 @@ global
ssl-default-bind-ciphers {{ OPNsense.HAProxy.general.tuning.ssl_cipherList }}
{% endif %}
{% if OPNsense.HAProxy.general.tuning.ssl_cipherSuites|default("") != "" %}
{% if helpers.exists('system.firmware.flavour') and not(helpers.empty('system.firmware.flavour')) and system.firmware.flavour|default('') == 'libressl' %}
# WARNING: ssl-default-bind-ciphersuites cannot be used with flavour {{ system.firmware.flavour}}.
{% else %}
ssl-default-bind-ciphersuites {{ OPNsense.HAProxy.general.tuning.ssl_cipherSuites }}
{% endif %}
{% endif %}
{% endif %}
{# # specify local peer #}
@ -1327,11 +1323,7 @@ frontend {{frontend.name}}
{% do ssl_options.append('ciphers ' ~ frontend.ssl_cipherList) %}
{% endif %}
{% if frontend.ssl_cipherSuites|default("") != "" %}
{% if helpers.exists('system.firmware.flavour') and not(helpers.empty('system.firmware.flavour')) and system.firmware.flavour|default('') == 'libressl' %}
# WARNING: ciphersuites cannot be used with flavour {{ system.firmware.flavour}}.
{% else %}
{% do ssl_options.append('ciphersuites ' ~ frontend.ssl_cipherSuites) %}
{% endif %}
{% endif %}
{# # HSTS #}
{% if frontend.ssl_hstsEnabled|default("") == '1' and frontend.mode == 'http' %}

2
security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogHost.xml
View File

@ -50,7 +50,7 @@
<label>Cipher</label>
<type>dropdown</type>
<help>The symmetric cipher algorithm used to encrypt UDP packets.
Any cipher supported by LibreSSL or OpenSSL is recognised.
Any cipher supported by OpenSSL is recognised.
Furthermore, specifying "none" will turn off packet encryption.
It is best to use only those ciphers which support CBC mode
</help>

2
security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
View File

@ -37,7 +37,7 @@
<label>Cipher</label>
<type>dropdown</type>
<help>The symmetric cipher algorithm used to encrypt UDP packets.
Any cipher supported by LibreSSL or OpenSSL is recognised.
Any cipher supported by OpenSSL is recognised.
Furthermore, specifying "none" will turn off packet encryption.
It is best to use only those ciphers which support CBC mode
</help>

3
vendor/sunnyvalley/Makefile vendored
View File

@ -1,9 +1,8 @@
PLUGIN_NAME= sunnyvalley
PLUGIN_VERSION= 1.2
PLUGIN_REVISION= 2
PLUGIN_REVISION= 3
PLUGIN_COMMENT= Vendor Repository for Zenarmor (a.k.a Sensei, Next Generation Firewall Extensions)
PLUGIN_MAINTAINER= opensource@sunnyvalley.io
PLUGIN_WWW= https://www.sunnyvalley.io
PLUGIN_DEPENDS= ${PLUGIN_FLAVOUR:tl}
.include "../../Mk/plugins.mk"

2
vendor/sunnyvalley/src/etc/pkg/repos/SunnyValley.conf.in vendored
View File

@ -1,6 +1,6 @@
SunnyValley: {
fingerprints: "/usr/local/etc/pkg/fingerprints/SunnyValley",
url: "https://updates.sunnyvalley.io/opnsense/${ABI}/%%PLUGIN_ABI%%/%%PLUGIN_FLAVOUR%%/latest",
url: "https://updates.sunnyvalley.io/opnsense/${ABI}/%%PLUGIN_ABI%%/OpenSSL/latest",
signature_type: "fingerprints",
priority: 7,
enabled: yes