aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/freeradius/APKBUILD6
-rw-r--r--main/freeradius/freeradius-fix-openssl-version-check.patch12
2 files changed, 17 insertions, 1 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 1f71f173f2..b7174ce40b 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=2.2.4
-pkgrel=2
+pkgrel=3
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
@@ -19,6 +19,7 @@ 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
freeradius.confd
freeradius.initd
"
@@ -229,11 +230,14 @@ webif() {
}
md5sums="4789b6657d1bb358f9da78f3d9a52cd1 freeradius-server-2.2.4.tar.gz
+fde9be89b76ed262db1198dfbeb237c6 freeradius-fix-openssl-version-check.patch
fc6693f3df5a0694610110287a28568a freeradius.confd
b3eefdfc466d80c241cd1bb11face405 freeradius.initd"
sha256sums="53b1d95faff0d4ee4cbfc969cda49c2f02ef33db16967612403f579515a73623 freeradius-server-2.2.4.tar.gz
+c0f15867924ae73511cd009cb3c53cbd7eda298ff708a54f02d1900da5ebfc06 freeradius-fix-openssl-version-check.patch
2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd
719bbe4a44df60e76f68d327f7ee70d4dfd6a95e51f9cb01f850cd4ed153f9de freeradius.initd"
sha512sums="84722f21876717046f1e3eb8d2b6a8b872342d7da844c1892ba8e659e5dd1f37e0ab462f82d27afbb29e3c99b85538a0bf42b5fc573d6cb159cf608a1a2f8bbd freeradius-server-2.2.4.tar.gz
+77ec50125b38e05ee784b4cf724a31074844ea9c935c0d28aa51bd71e3e8a5399ba5194958f65f8c7f6c501b67ea6560da3869917f661178afbe602062a6fdc6 freeradius-fix-openssl-version-check.patch
e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd
57f12f06ef9112817204dec4ab2591bcd4baf3c8a033afadb2376e115911f76045c70b7a2c80b294a83dac4e05b1ff22335a3bcc9af1c0760682622ab2cdbd31 freeradius.initd"
diff --git a/main/freeradius/freeradius-fix-openssl-version-check.patch b/main/freeradius/freeradius-fix-openssl-version-check.patch
new file mode 100644
index 0000000000..d13ab83567
--- /dev/null
+++ b/main/freeradius/freeradius-fix-openssl-version-check.patch
@@ -0,0 +1,12 @@
+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,