aboutsummaryrefslogtreecommitdiffstats
path: root/main/freeradius
diff options
context:
space:
mode:
authorŁukasz Jendrysik <scadu@yandex.com>2015-01-26 11:46:15 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2015-01-26 14:21:29 +0000
commit48b2a90c0b213e4779af85952254e262b0e39566 (patch)
treeef86989dd5d6bd4d7bbd4afae78339bdab550c48 /main/freeradius
parent5eeaf5e54b70a203e52e9abadce513343a8796c0 (diff)
main/freeradius: upgrade to 2.2.6, rebuild against mariadb
Diffstat (limited to 'main/freeradius')
-rw-r--r--main/freeradius/APKBUILD17
-rw-r--r--main/freeradius/freeradius-fix-openssl-version-check.patch12
2 files changed, 7 insertions, 22 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 6a78f2bff62..24cdfe63ff8 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -1,14 +1,15 @@
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
-pkgver=2.2.5
-pkgrel=4
+pkgver=2.2.6
+pkgrel=0
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
license="GPL"
depends="freeradius-radclient freeradius-lib"
-makedepends="openssl-dev mysql-dev postgresql-dev gdbm-dev readline-dev
+makedepends="openssl-dev mariadb-dev postgresql-dev gdbm-dev readline-dev
bash libtool autoconf automake perl-dev python-dev openldap-dev
unixodbc-dev linux-pam-dev sqlite-dev linux-headers"
pkggroups="radius"
@@ -19,7 +20,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg $pkgname-ldap $pkgname-lib
$pkgname-postgresql $pkgname-python $pkgname-radclient $pkgname-sqlite
$pkgname-unixodbc $pkgname-pam $pkgname-webif $pkgname-webif-doc"
source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
- freeradius-fix-openssl-version-check.patch
0001-Use-threadsafe-wrapper-for-getpwnam-getgrnam.patch
0001-use-threadsafe-rad_getgrnam.patch
fix-tls-test.patch
@@ -245,22 +245,19 @@ webif() {
done
}
-md5sums="da77eb23b4c5e2f9fc55119025a91b61 freeradius-server-2.2.5.tar.gz
-fde9be89b76ed262db1198dfbeb237c6 freeradius-fix-openssl-version-check.patch
+md5sums="3d1af22fccef74dbc06785ab1abdfd1f freeradius-server-2.2.6.tar.gz
f28735060b63d88875783817bcd95586 0001-Use-threadsafe-wrapper-for-getpwnam-getgrnam.patch
aa00c3ed02b53021113b2e145d312ee4 0001-use-threadsafe-rad_getgrnam.patch
b6bcdba16c65503be4265126cf4d2eee fix-tls-test.patch
fc6693f3df5a0694610110287a28568a freeradius.confd
b3eefdfc466d80c241cd1bb11face405 freeradius.initd"
-sha256sums="8c4c2a0b600a8d85d2235589a5e80d4fefd1f52317e9daf8193731566fa9d012 freeradius-server-2.2.5.tar.gz
-c0f15867924ae73511cd009cb3c53cbd7eda298ff708a54f02d1900da5ebfc06 freeradius-fix-openssl-version-check.patch
+sha256sums="f0941f4757ace0a46b9dec11245c9e5b3addbb93a45141179638e3687b56be13 freeradius-server-2.2.6.tar.gz
115ae559fc5c8a638c5ebb510cb58478df66ceeb61a6768584e592e4a1fbc9d4 0001-Use-threadsafe-wrapper-for-getpwnam-getgrnam.patch
8f2dd61e5f90c83198fa26f66bca54394b17cafbb8d2bbb97e948b4f55d1f071 0001-use-threadsafe-rad_getgrnam.patch
38455012b9fc322a7bfdec66e4f8aafeb679d0142eddfba31114aadfd8195b41 fix-tls-test.patch
2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd
719bbe4a44df60e76f68d327f7ee70d4dfd6a95e51f9cb01f850cd4ed153f9de freeradius.initd"
-sha512sums="511599b4f4f5906441d0cda61946341f2226b9aae69b6f68b03a19898b6385499a8221933c191232d50f736cab93f0f6f271e4defe4552e7738cb21e2415f053 freeradius-server-2.2.5.tar.gz
-77ec50125b38e05ee784b4cf724a31074844ea9c935c0d28aa51bd71e3e8a5399ba5194958f65f8c7f6c501b67ea6560da3869917f661178afbe602062a6fdc6 freeradius-fix-openssl-version-check.patch
+sha512sums="0b2dcefa8607ae88b9cb1f21aaaa7c43d553ea2951dc2163b297560a68729e09820b329e47872355020ac9a987bcebbf8e1e2616f75b1089b706bbd0e296e6fc freeradius-server-2.2.6.tar.gz
4fb99b6a0f22cb844382139d448e24cc1b698452e30c1b0f06674a6fbd21463bcece2f2f4121618f9c7c57c8eb882eee35511b4dcea6e2a0904e27e5f2a6a679 0001-Use-threadsafe-wrapper-for-getpwnam-getgrnam.patch
dfe522350a2d45bf81c362ee87c57021149f196d4d45b8567911a1bd74e6b11b5172042a36e02f651157854251c08e846330e5d862767427ad7850ac6eac4f96 0001-use-threadsafe-rad_getgrnam.patch
77ee33a3c2059fb07841255fefc577f4e04680f4a1968d320a17f1d2769ddb671c36639dadbba0a1b1faaa31b1fb0c900313c375a209e67c41d75ebf9bef9d8f fix-tls-test.patch
diff --git a/main/freeradius/freeradius-fix-openssl-version-check.patch b/main/freeradius/freeradius-fix-openssl-version-check.patch
deleted file mode 100644
index d13ab835677..00000000000
--- a/main/freeradius/freeradius-fix-openssl-version-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru freeradius-server-2.2.4.orig/src/main/version.c freeradius-server-2.2.4/src/main/version.c
---- freeradius-server-2.2.4.orig/src/main/version.c 2014-03-19 19:20:49.000000000 -0200
-+++ freeradius-server-2.2.4/src/main/version.c 2014-06-12 10:54:48.173755346 -0300
-@@ -54,7 +54,7 @@
-
- ssl_linked = SSLeay();
-
-- if (ssl_linked != ssl_built) {
-+ if (((ssl_linked >> 8) != (ssl_built >> 8)) || (ssl_linked < ssl_built)) {
- radlog(L_ERR, "libssl version mismatch."
- " Built with: %lx\n Linked: %lx",
- (unsigned long) ssl_built,