FreeRADIUS: update to 3.0.21.

This commit is contained in:
Anthony Iliopoulos 2021-05-03 20:31:25 +02:00 committed by Érico Nogueira Rolim
parent e652ee4746
commit d5d6eac1d6
2 changed files with 4 additions and 45 deletions

View file

@ -1,41 +0,0 @@
--- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c 2018-04-17 19:12:27.000000000 +0200
+++ src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c 2019-04-27 16:56:01.628410415 +0200
@@ -44,7 +44,7 @@
{
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)
int md_size;
if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
diff --git src/main/tls.c src/main/tls.c
index db73399..3a64534 100644
--- src/main/tls.c
+++ src/main/tls.c
@@ -1565,7 +1565,7 @@ done:
return 0;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
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)
@@ -3394,14 +3394,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

View file

@ -1,17 +1,17 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.20
revision=5
version=3.0.21
revision=1
wrksrc=freeradius-server-release_${version//./_}
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
short_desc="World's most popular RADIUS Server"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://freeradius.org"
distfiles="https://github.com/FreeRADIUS/freeradius-server/archive/release_${version//./_}.tar.gz"
checksum=8177fe550af6685a040884dbe3df28431bdc5a8d3a48a9f4f88bdb49f2d0e90c
checksum=b2014372948a92f86cfe2cf43c58ef47921c03af05666eb9d6416bdc6eeaedc2
nocross=yes # Not supported by upstream
system_accounts="_freeradius"
make_dirs="/etc/raddb 0750 _freeradius _freeradius"