cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to freeradius-3.0.21

Browse Source
This commit is contained in:
sthen 2020-03-26 09:47:30 +00:00
parent 71f200aef7
commit 006fff3433
8 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/freeradius3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2020/01/30 22:37:58 sthen Exp $
# $OpenBSD: Makefile,v 1.44 2020/03/26 09:47:30 sthen Exp $
PORTROACH= limit:^3\.
@ -11,8 +11,7 @@ COMMENT-mysql= freeradius mysql rlm addon
COMMENT-pgsql= freeradius pgsql rlm addon
COMMENT-python= freeradius python rlm addon
V= 3.0.20
REVISION-main= 0
V= 3.0.21
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2

4
net/freeradius3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freeradius-server-3.0.20.tar.bz2) = 4lJHhwrrFU0vde/eIlcwlcDxBdhXQO+Voq0YbF5eyBU=
SIZE (freeradius-server-3.0.20.tar.bz2) = 3161984
SHA256 (freeradius-server-3.0.21.tar.bz2) = wi2tQ5VLDLyVdWTT+Mu5Qv8JhThS0sIVXVTmvWQaTn0=
SIZE (freeradius-server-3.0.21.tar.bz2) = 3184588

39
net/freeradius3/patches/patch-src_main_tls_c
View File

@ -1,19 +1,9 @@
$OpenBSD: patch-src_main_tls_c,v 1.8 2019/11/19 13:03:49 sthen Exp $
$OpenBSD: patch-src_main_tls_c,v 1.9 2020/03/26 09:47:30 sthen Exp $
Index: src/main/tls.c
--- src/main/tls.c.orig
+++ src/main/tls.c
@@ -1565,7 +1565,8 @@ done:
return 0;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000fL)
static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
#else
static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
@@ -2120,7 +2121,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
@@ -2122,7 +2122,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
char cn_str[1024];
char buf[64];
X509 *client_cert;
@ -23,7 +13,7 @@ Index: src/main/tls.c
const STACK_OF(X509_EXTENSION) *ext_list;
#else
STACK_OF(X509_EXTENSION) *ext_list;
@@ -2319,7 +2321,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
@@ -2334,7 +2335,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
}
if (lookup == 0) {
@ -33,7 +23,7 @@ Index: src/main/tls.c
ext_list = X509_get0_extensions(client_cert);
#else
X509_CINF *client_inf;
@@ -3182,7 +3185,7 @@ post_ca:
@@ -3222,7 +3224,7 @@ post_ca:
#ifdef SSL_OP_NO_TLSv1
if (conf->disable_tlsv1) {
ctx_options |= SSL_OP_NO_TLSv1;
@ -42,7 +32,7 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1");
#endif
}
@@ -3192,7 +3195,7 @@ post_ca:
@@ -3232,7 +3234,7 @@ post_ca:
#ifdef SSL_OP_NO_TLSv1_1
if (conf->disable_tlsv1_1) {
ctx_options |= SSL_OP_NO_TLSv1_1;
@ -51,7 +41,7 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
#endif
}
@@ -3203,7 +3206,7 @@ post_ca:
@@ -3243,7 +3245,7 @@ post_ca:
if (conf->disable_tlsv1_2) {
ctx_options |= SSL_OP_NO_TLSv1_2;
@ -60,20 +50,3 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
#endif
}
@@ -3394,14 +3397,14 @@ post_ca:
*/
SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_num_tickets(ctx, 1);
#endif
} else {
SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
/*
* This controls the number of stateful or stateless tickets
* generated with TLS 1.3. In OpenSSL 1.1.1 it's also

15
net/freeradius3/patches/patch-src_modules_rlm_eap_types_rlm_eap_fast_eap_fast_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_fast_eap_fast_c,v 1.1 2018/10/24 17:15:25 jsing Exp $
Index: src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
--- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c.orig
+++ src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
@@ -44,7 +44,8 @@ static int openssl_get_keyblock_size(REQUEST *request,
{
const EVP_CIPHER *c;
const EVP_MD *h;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
int md_size;
if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||

14
net/freeradius3/pkg/PLIST-iodbc
View File

@ -1,12 +1,24 @@
@comment $OpenBSD: PLIST-iodbc,v 1.4 2019/11/19 12:19:39 sthen Exp $
@comment $OpenBSD: PLIST-iodbc,v 1.5 2020/03/26 09:47:30 sthen Exp $
@option is-branch
@conflict freeradius-iodbc-*
@so lib/freeradius/rlm_sql_iodbc.so
@mode 750
@group _freeradius
share/examples/freeradius/mods-config/sql/ippool/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/
@mode 640
share/examples/freeradius/mods-config/sql/ippool/mssql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/schema.sql
@mode 750
share/examples/freeradius/mods-config/sql/main/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/
@mode 640
share/examples/freeradius/mods-config/sql/main/mssql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/queries.conf
share/examples/freeradius/mods-config/sql/main/mssql/schema.sql

10
net/freeradius3/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.16 2020/01/30 22:37:59 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.17 2020/03/26 09:47:30 sthen Exp $
@option is-branch
@conflict freeradius-*
@conflict radiusd-cistron-*
@ -588,6 +588,10 @@ share/examples/freeradius/mods-config/sql/main/
@comment @sample ${FREERADIUS_ETC}/mods-config/sql/main/mongo/queries.conf
share/examples/freeradius/mods-config/sql/main/sqlite/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/sqlite/
share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-refresh.sh
@sample ${FREERADIUS_ETC}/mods-config/sql/main/sqlite/process-radacct-refresh.sh
share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/sqlite/process-radacct-schema.sql
share/examples/freeradius/mods-config/sql/main/sqlite/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/sqlite/queries.conf
share/examples/freeradius/mods-config/sql/main/sqlite/schema.sql
@ -847,6 +851,7 @@ share/freeradius/dictionary.motorola
share/freeradius/dictionary.motorola.illegal
share/freeradius/dictionary.motorola.wimax
share/freeradius/dictionary.navini
share/freeradius/dictionary.net
share/freeradius/dictionary.netscreen
share/freeradius/dictionary.networkphysics
share/freeradius/dictionary.nexans
@ -861,12 +866,14 @@ share/freeradius/dictionary.paloalto
share/freeradius/dictionary.patton
share/freeradius/dictionary.perle
share/freeradius/dictionary.pfsense
share/freeradius/dictionary.pica8
share/freeradius/dictionary.propel
share/freeradius/dictionary.prosoft
share/freeradius/dictionary.proxim
share/freeradius/dictionary.purewave
share/freeradius/dictionary.quiconnect
share/freeradius/dictionary.quintum
share/freeradius/dictionary.rcntec
share/freeradius/dictionary.redcreek
share/freeradius/dictionary.rfc2865
share/freeradius/dictionary.rfc2866
@ -935,6 +942,7 @@ share/freeradius/dictionary.usr
share/freeradius/dictionary.usr.illegal
share/freeradius/dictionary.utstarcom
share/freeradius/dictionary.valemount
share/freeradius/dictionary.vasexperts
share/freeradius/dictionary.verizon
share/freeradius/dictionary.versanet
share/freeradius/dictionary.vqp

8
net/freeradius3/pkg/PLIST-mysql
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-mysql,v 1.6 2019/11/19 13:03:49 sthen Exp $
@comment $OpenBSD: PLIST-mysql,v 1.7 2020/03/26 09:47:30 sthen Exp $
@option is-branch
@conflict freeradius-mysql-*
@so lib/freeradius/rlm_sql_mysql.so
@ -35,10 +35,10 @@ share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/
@mode 640
share/examples/freeradius/mods-config/sql/ippool/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mysql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/schema.sql
@mode 750
@ -53,6 +53,8 @@ share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/schema.sql

4
net/freeradius3/pkg/PLIST-pgsql
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pgsql,v 1.7 2019/11/19 12:19:39 sthen Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.8 2020/03/26 09:47:30 sthen Exp $
@option is-branch
@conflict freeradius-pgsql-*
@so lib/freeradius/rlm_sql_postgresql.so
@ -43,6 +43,8 @@ share/examples/freeradius/mods-config/sql/main/postgresql/extras/cisco_h323_db_s
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
share/examples/freeradius/mods-config/sql/main/postgresql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/main/postgresql/schema.sql