diff options
| -rw-r--r-- | main/freeradius/APKBUILD | 12 | ||||
| -rw-r--r-- | main/freeradius/libressl.patch | 27 |
2 files changed, 5 insertions, 34 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index 76fa2e308e..ea3f3e6246 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -4,8 +4,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=freeradius _realname=freeradius -pkgver=3.0.13 -pkgrel=3 +pkgver=3.0.15 +pkgrel=0 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="http://freeradius.org/" arch="all" @@ -24,14 +24,13 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-lib $pkgname-unixodbc $pkgname-pam $pkgname-eap $pkgname-krb5 $pkgname-rest $pkgname-redis" provides="freeradius3=$pkgver-r$pkgrel" -source="ftp://ftp.freeradius.org/pub/freeradius/old/$_realname-server-$pkgver.tar.gz +source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz $pkgname.confd $pkgname.initd musl-fix-headers.patch fix-scopeid.patch freeradius-313-default-config.patch - libressl.patch " builddir="$srcdir"/$_realname-server-$pkgver @@ -274,10 +273,9 @@ redis() { mv "${pkgdir}"${radlibdir}/rlm_redis* "${subpkgdir}"${radlibdir} } -sha512sums="b4cb6203ca34ec459ea0f4f7960b4c5039ecd1be3de005251213ab6a9254d11fa9534b96d222eb83e6b35966aaeb6081362fd103eb73e0d76c009a655a47277f freeradius-server-3.0.13.tar.gz +sha512sums="9b92045b445032bde9d421499fdc0f6a08d602c501730c31a8d3974b21cc5c12c78abb024ed62a176c7aa7fe260fe1d19386aaf558e0fecfcd3a0ba7aa47499c freeradius-server-3.0.15.tar.gz e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd ba3c424d4eabb147c7aa3e31575a87ddb26b6a792d2a8714e73d8763e07854326a03a83991a7420246ca06bf0b93d0a6f23ec198f5e48647f9d25b40067e852a freeradius.initd c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch 41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch -666e15a3c3e5b98ff8c3168de85b341606af5e2790af379ddec46464e9d7de14a715876a34ba1eb7fa47ddead23f7134128d591db32309db0e4acbdb6f21ef5e freeradius-313-default-config.patch -b80664efeab55e36880df400021e2c958f65825e55f81d618e087cee5e98f56d149e898f3162744131d3d0bd6c600715e8ddc04a28f0e720c07cc8920ea80ed4 libressl.patch" +666e15a3c3e5b98ff8c3168de85b341606af5e2790af379ddec46464e9d7de14a715876a34ba1eb7fa47ddead23f7134128d591db32309db0e4acbdb6f21ef5e freeradius-313-default-config.patch" diff --git a/main/freeradius/libressl.patch b/main/freeradius/libressl.patch deleted file mode 100644 index ab5442a8d9..0000000000 --- a/main/freeradius/libressl.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- freeradius-server-3.0.13.orig/src/main/tls.c -+++ freeradius-server-3.0.13/src/main/tls.c -@@ -2131,7 +2131,7 @@ - } - - if (lookup == 0) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L - ext_list = X509_get0_extensions(client_cert); - #else - X509_CINF *client_inf; -@@ -2903,6 +2903,7 @@ - SSL_CTX_set_verify_depth(ctx, conf->verify_depth); - } - -+#if OPENSSL_VERSION_NUMBER < 0x20000000L - /* Load randomness */ - if (conf->random_file) { - if (!(RAND_load_file(conf->random_file, 1024*10))) { -@@ -2910,6 +2911,7 @@ - return NULL; - } - } -+#endif - - /* - * Set the cipher list if we were told to |