aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-03-24 14:22:51 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-03-26 11:17:50 +0000
commitd73845a70968bbed388529c56903f087e5deda21 (patch)
tree9b36fbdf53ed733ece75dd61b4f09eaeacccabb1
parent98156bd393baa3a498cefb35fdef1bd01e4ea693 (diff)
downloadaports-d73845a70968bbed388529c56903f087e5deda21.tar.bz2
aports-d73845a70968bbed388529c56903f087e5deda21.tar.xz
main/freeradius: upgrade to 3.0.21
-rw-r--r--main/freeradius/APKBUILD10
-rw-r--r--main/freeradius/Fix-permissions-of-certs-in-bootstrap-fallback.patch43
2 files changed, 4 insertions, 49 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 4bf43cbcbe..ec3746f8d3 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -4,8 +4,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
-pkgver=3.0.20
-pkgrel=10
+pkgver=3.0.21
+pkgrel=0
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="https://freeradius.org/"
arch="all"
@@ -63,7 +63,7 @@ subpackages="
$pkgname-utils
"
provides="freeradius3=$pkgver-r$pkgrel"
-source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
+source="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-$pkgver.tar.gz
$pkgname.logrotated
radiusd.confd
radiusd.initd
@@ -75,7 +75,6 @@ source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
default-config.patch
remove-eap-from-default-mods.patch
readme-setup-script.patch
- Fix-permissions-of-certs-in-bootstrap-fallback.patch
fix-request_running-segfault.patch
dont-install-test-tools.patch
"
@@ -382,7 +381,7 @@ _enable_mod() {
ln -s ../mods-available/$1 "$subpkgdir"/$_radconfdir/mods-enabled/$1
}
-sha512sums="513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312 freeradius-server-3.0.20.tar.gz
+sha512sums="85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa freeradius-server-3.0.21.tar.gz
c3ae1ee6bd7743f883310612ba2c20c6ff7f288fedc308735df05b097ecb2f7fa4d1679b844e262757808978c7bb2d7630b99e4b87ce6d6ba7f84013f9c49f1d freeradius.logrotated
bb3df1fa2c9ed95514ae090e0f6619c4e3280f424c4351bc79f5254bf1a327fa7d27e5fe3add5ab8d9e5ba3792c9553bd9a0481fe9c5bc34945ce46627ef2638 radiusd.confd
a66ab5d3f1c86450e9c50aa8be10a40fb4118467670048773ad8c80b5f3fb958dd3addc6ef245289d93ce2b184ce2c9882a8a2585d4a134d55c2326c9559f558 radiusd.initd
@@ -393,6 +392,5 @@ c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d
c266718d830076423c19a31c608a925ec664156ef2da87c97166d376b16f4582e7f8adebd9c8e3ef51b24da0ca3252f00b557ed9ee9dd8325d8a6a317f4e3ed1 default-config.patch
f96b7b2e0fc614cb8b70bd500933538e98e05b58718af931a62bc7ba2307600cf8c2a8a99de856ad2e18101dd5bfe95c50ee34de20eef21ba0ad795577a6619b remove-eap-from-default-mods.patch
55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd readme-setup-script.patch
-f88cb4ae335d67211c8563b6df88e20ee3729e57aa56423f99b518f83b190479b38bb189a0ab53c70ef9709a6229ccaa506ea6b79844cbfd4f2a7f0c7c292045 Fix-permissions-of-certs-in-bootstrap-fallback.patch
7ddf75901f635216b0d972c14631334a8138e0dbb021685bb6b3a996f38d232b84146c621dae541b00f6149fa401e835d1579bbacd27fad72a80bacd4391b404 fix-request_running-segfault.patch
908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674 dont-install-test-tools.patch"
diff --git a/main/freeradius/Fix-permissions-of-certs-in-bootstrap-fallback.patch b/main/freeradius/Fix-permissions-of-certs-in-bootstrap-fallback.patch
deleted file mode 100644
index 9f80f76e09..0000000000
--- a/main/freeradius/Fix-permissions-of-certs-in-bootstrap-fallback.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6bdb22ef951b4b3e83c788fcb20e4dddf8301ad3 Mon Sep 17 00:00:00 2001
-From: Jorge Pereira <jpereiran@gmail.com>
-Date: Mon, 18 Nov 2019 12:43:29 -0300
-Subject: [PATCH] Fix permissions of certs in bootstrap fallback. ref #3132
-
----
- raddb/certs/bootstrap | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/raddb/certs/bootstrap b/raddb/certs/bootstrap
-index 0f719aafd4..57de8cf0d7 100755
---- a/raddb/certs/bootstrap
-+++ b/raddb/certs/bootstrap
-@@ -42,6 +42,7 @@ fi
-
- if [ ! -f server.key ]; then
- openssl req -new -out server.csr -keyout server.key -config ./server.cnf || exit 1
-+ chmod g+r server.key
- fi
-
- if [ ! -f ca.key ]; then
-@@ -62,11 +63,13 @@ fi
-
- if [ ! -f server.p12 ]; then
- openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1
-+ chmod g+r server.p12
- fi
-
- if [ ! -f server.pem ]; then
- openssl pkcs12 -in server.p12 -out server.pem -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1
- openssl verify -CAfile ca.pem server.pem || exit 1
-+ chmod g+r server.pem
- fi
-
- if [ ! -f ca.der ]; then
-@@ -75,6 +78,7 @@ fi
-
- if [ ! -f client.key ]; then
- openssl req -new -out client.csr -keyout client.key -config ./client.cnf
-+ chmod g+r client.key
- fi
-
- if [ ! -f client.crt ]; then