aboutsummaryrefslogtreecommitdiffstats
path: root/main/freeradius
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-04-04 12:29:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-04-04 12:29:34 +0000
commit80837ce1a1c59bdd8ed4fad38814519aeeb98380 (patch)
tree7b2ff8b99b58bb5329851ef97f57fa80a176f92d /main/freeradius
parent755936362be290713cd3d17daa034a3c2b868f41 (diff)
downloadaports-80837ce1a1c59bdd8ed4fad38814519aeeb98380.tar.bz2
aports-80837ce1a1c59bdd8ed4fad38814519aeeb98380.tar.xz
main/freeradius: upgrade to 2.2.4
Diffstat (limited to 'main/freeradius')
-rw-r--r--main/freeradius/APKBUILD20
-rw-r--r--main/freeradius/CVE-2014-2015.patch35
2 files changed, 8 insertions, 47 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 0ebc281505..303489a100 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
-pkgver=2.2.3
-pkgrel=5
+pkgver=2.2.4
+pkgrel=0
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
@@ -21,7 +21,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg $pkgname-ldap $pkgname-lib
source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
freeradius.confd
freeradius.initd
- CVE-2014-2015.patch
"
_builddir="$srcdir"/$pkgname-server-$pkgver
@@ -229,15 +228,12 @@ webif() {
done
}
-md5sums="3186e75882c5aaed699da55be10511fe freeradius-server-2.2.3.tar.gz
+md5sums="4789b6657d1bb358f9da78f3d9a52cd1 freeradius-server-2.2.4.tar.gz
fc6693f3df5a0694610110287a28568a freeradius.confd
-b3eefdfc466d80c241cd1bb11face405 freeradius.initd
-7dd09b1b0631f6bf126517e737c5e576 CVE-2014-2015.patch"
-sha256sums="3be1e132f243ac53a7d35e0710bd116e8e126b64a1fc1198034195355072f593 freeradius-server-2.2.3.tar.gz
+b3eefdfc466d80c241cd1bb11face405 freeradius.initd"
+sha256sums="53b1d95faff0d4ee4cbfc969cda49c2f02ef33db16967612403f579515a73623 freeradius-server-2.2.4.tar.gz
2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd
-719bbe4a44df60e76f68d327f7ee70d4dfd6a95e51f9cb01f850cd4ed153f9de freeradius.initd
-d70b898811cbbb9d77d9863a7ba9b243b9782bdc767b586e4e9b8787558f1072 CVE-2014-2015.patch"
-sha512sums="d51208d9926872292ef333bcf4e556a7fd06ac78def846c620422258c18ab77f98a22459a78bb92a35e684469d167a018ba2d47d894c32c7368a57e79fba9ede freeradius-server-2.2.3.tar.gz
+719bbe4a44df60e76f68d327f7ee70d4dfd6a95e51f9cb01f850cd4ed153f9de freeradius.initd"
+sha512sums="84722f21876717046f1e3eb8d2b6a8b872342d7da844c1892ba8e659e5dd1f37e0ab462f82d27afbb29e3c99b85538a0bf42b5fc573d6cb159cf608a1a2f8bbd freeradius-server-2.2.4.tar.gz
e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd
-57f12f06ef9112817204dec4ab2591bcd4baf3c8a033afadb2376e115911f76045c70b7a2c80b294a83dac4e05b1ff22335a3bcc9af1c0760682622ab2cdbd31 freeradius.initd
-62d98d8316e147d57de9ac05c05c9703c08bd23e294b95827c58fe976cb3bc5ce040d9e310ada552cb2350dde9e9e2c97e2160210cc1ab5d1ce35889000d7951 CVE-2014-2015.patch"
+57f12f06ef9112817204dec4ab2591bcd4baf3c8a033afadb2376e115911f76045c70b7a2c80b294a83dac4e05b1ff22335a3bcc9af1c0760682622ab2cdbd31 freeradius.initd"
diff --git a/main/freeradius/CVE-2014-2015.patch b/main/freeradius/CVE-2014-2015.patch
deleted file mode 100644
index fbd5ff0833..0000000000
--- a/main/freeradius/CVE-2014-2015.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0d606cfc29ab2e91764854e733d4525e6c667eb9 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Thu, 13 Feb 2014 09:29:35 -0500
-Subject: [PATCH] Increase buffer size. Use output buffer size as limit for
- hex2bin
-
----
- src/modules/rlm_pap/rlm_pap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
-index 8ef2152..1492a44 100644
---- a/src/modules/rlm_pap/rlm_pap.c
-+++ b/src/modules/rlm_pap/rlm_pap.c
-@@ -247,7 +247,7 @@ static int base64_decode (const char *src, uint8_t *dst)
- static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
- {
- size_t decoded;
-- uint8_t buffer[64];
-+ uint8_t buffer[256];
-
- if (min_length >= sizeof(buffer)) return; /* paranoia */
-
-@@ -255,7 +255,7 @@ static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
- * Hex encoding.
- */
- if (vp->length >= (2 * min_length)) {
-- decoded = fr_hex2bin(vp->vp_strvalue, buffer, vp->length >> 1);
-+ decoded = fr_hex2bin(vp->vp_strvalue, buffer, sizeof(buffer));
- if (decoded == (vp->length >> 1)) {
- RDEBUG2("Normalizing %s from hex encoding", vp->name);
- memcpy(vp->vp_octets, buffer, decoded);
---
-1.8.5.5
-