mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
FreeRADIUS: update to 3.0.20
Update to 3.0.20 and changed distfile location(fixes timeouts) Updated libressl.patch to fix build with LibreSSL 3.0.2 Signed-off-by: Nathan Owens <ndowens04@gmail.com>
This commit is contained in:
parent
594e97e4dc
commit
7e3137b716
2 changed files with 41 additions and 11 deletions
|
@ -5,7 +5,37 @@
|
||||||
const EVP_CIPHER *c;
|
const EVP_CIPHER *c;
|
||||||
const EVP_MD *h;
|
const EVP_MD *h;
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL)
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||||
int md_size;
|
int md_size;
|
||||||
|
|
||||||
if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
|
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
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
# Template file for 'FreeRADIUS'
|
# Template file for 'FreeRADIUS'
|
||||||
pkgname=FreeRADIUS
|
pkgname=FreeRADIUS
|
||||||
version=3.0.17
|
version=3.0.20
|
||||||
revision=4
|
revision=1
|
||||||
wrksrc=freeradius-server-${version}
|
wrksrc=freeradius-server-release_${version//./_}
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
nocross=yes # Not supported by upstream
|
|
||||||
makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
|
makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
|
||||||
libmariadbclient-devel postgresql-libs-devel json-c-devel"
|
libmariadbclient-devel postgresql-libs-devel json-c-devel"
|
||||||
|
short_desc="World's most popular RADIUS Server"
|
||||||
|
maintainer="Michael Aldridge <maldridge@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
|
||||||
|
nocross=yes # Not supported by upstream
|
||||||
system_accounts="_freeradius"
|
system_accounts="_freeradius"
|
||||||
make_dirs="/etc/raddb 0750 _freeradius _freeradius"
|
make_dirs="/etc/raddb 0750 _freeradius _freeradius"
|
||||||
short_desc="The world's most popular RADIUS Server"
|
|
||||||
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
|
|
||||||
license="GPL-2"
|
|
||||||
homepage="http://freeradius.org"
|
|
||||||
distfiles="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.bz2"
|
|
||||||
checksum=3f03404b6e4a4f410e1f15ea2ababfec7f8a7ae8a49836d8a0c137436d913b96
|
|
||||||
|
|
||||||
pre_install() {
|
pre_install() {
|
||||||
# FreeRADIUS uses 'R' instead of 'DESTDIR'
|
# FreeRADIUS uses 'R' instead of 'DESTDIR'
|
||||||
|
|
Loading…
Add table
Reference in a new issue