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

config: turn CRYPTO into build.conf SSL setting 

We might want to change it, but more like "openssl-devel" to try version
3 at some later point in time.  The FLAVOUR magic can go gradually, see
next commit.
This commit is contained in:
Franco Fichtner 2023-02-03 14:34:12 +01:00
parent c28dc4bd45
commit b2e630c371
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -156,12 +156,10 @@ VERBOSE_FLAGS= -x
VERBOSE_HIDDEN= @
.endif
.for _VERSION in ABI DEBUG LUA PERL PHP PYTHON RUBY VERSION ZFS
.for _VERSION in ABI DEBUG LUA PERL PHP PYTHON RUBY SSL VERSION ZFS
VERSIONS+= PRODUCT_${_VERSION}=${${_VERSION}}
.endfor
VERSIONS+= PRODUCT_CRYPTO=${FLAVOUR:[1]:tl}
# Expand build steps to launch into the selected
# script with the proper build options set:

4
build/make.conf.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2021-2022 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2021-2023 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -33,7 +33,7 @@ SELF=make.conf
SED=sed
for KEY in LUA PERL PHP PYTHON RUBY; do
for KEY in LUA PERL PHP PYTHON RUBY SSL; do
eval VALUE="\${PRODUCT_${KEY}}"
SED="${SED} -e s:%%${KEY}%%:${VALUE}:g"
done

1
config/23.1/build.conf
View File

@ -4,3 +4,4 @@ PERL?= 5.32
PHP?= 81
PYTHON?= 39
RUBY?= 27
SSL?= openssl

12
config/23.1/make.conf
View File

@ -10,7 +10,6 @@ _PRODUCT_FLAVOUR!= if [ -f ${PRODUCT_OPENSSL} ]; \
echo Base; \
fi
PRODUCT_FLAVOUR?= ${_PRODUCT_FLAVOUR:[1]}
PRODUCT_CRYPTO= ${PRODUCT_FLAVOUR:tl}
PRODUCT_PHPBIN?= /usr/local/bin/php
.if exists(${PRODUCT_PHPBIN})
@ -25,6 +24,7 @@ PRODUCT_PERL?= %%PERL%%
PRODUCT_PHP?= %%PHP%%
PRODUCT_PYTHON?= %%PYTHON%%
PRODUCT_RUBY?= %%RUBY%%
PRODUCT_SSL?= %%SSL%%
PRODUCT_GSSAPI?= GSSAPI_MIT
@ -33,13 +33,13 @@ PRODUCT_GSSAPI?= GSSAPI_MIT
OPTIONS_SET= MONPLUGINS
OPTIONS_UNSET= DBUS DOCS EXAMPLES GCC GSSAPI_BASE NAGPLUGINS \
NLS OPENGL WAYLAND X11
DEFAULT_VERSIONS= python=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= ruby=${PRODUCT_RUBY:C/^./&./}
DEFAULT_VERSIONS+= ssl=${PRODUCT_CRYPTO}
DEFAULT_VERSIONS= lua=${PRODUCT_LUA}
DEFAULT_VERSIONS+= perl5=${PRODUCT_PERL}
DEFAULT_VERSIONS+= php=${PRODUCT_PHP}
DEFAULT_VERSIONS+= lua=${PRODUCT_LUA}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= python=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= ruby=${PRODUCT_RUBY:C/^./&./}
DEFAULT_VERSIONS+= ssl=${PRODUCT_SSL}
SRC_BASE= %%SRCDIR%%
ALLOW_UNSUPPORTED_SYSTEM=why not
WARNING_WAIT= 0 # no time

2
config/23.1/ports.conf
View File

@ -175,7 +175,7 @@ ports-mgmt/pkg
ports-mgmt/poudriere
print/cups arm
print/texinfo
security/${PRODUCT_CRYPTO}
security/${PRODUCT_SSL}
security/acme.sh
security/autossh arm
security/ca_root_nss