diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-06-12 10:53:08 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-13 13:36:31 +0000 |
| commit | b030d122f412676e2a2b42c24de6040b8719bc10 (patch) | |
| tree | ff629c22c4bde87997b7ab0c1e0fe776909eaab6 | |
| parent | 21ee8eac785b89924cf80f0330c6693bd27b08d8 (diff) | |
| download | aports-b030d122f412676e2a2b42c24de6040b8719bc10.tar.bz2 aports-b030d122f412676e2a2b42c24de6040b8719bc10.tar.xz | |
main/freeradius: fix openssl version check
Make sure ABI version is correct, and that we are linked at least
to the version compled against. This allows openssl security upgrades
that are ABI stable without recompiling freeradius.
(cherry picked from commit 94983a506d2e95be0a5864ae7bcc7d7d61dc6cce)
Conflicts:
main/freeradius/APKBUILD
| -rw-r--r-- | main/freeradius/APKBUILD | 6 | ||||
| -rw-r--r-- | main/freeradius/freeradius-fix-openssl-version-check.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index e430701ea3..c93f0e8533 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=freeradius pkgver=2.2.3 -pkgrel=9 +pkgrel=10 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-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 CVE-2014-2015.patch @@ -230,14 +231,17 @@ webif() { } md5sums="3186e75882c5aaed699da55be10511fe freeradius-server-2.2.3.tar.gz +fde9be89b76ed262db1198dfbeb237c6 freeradius-fix-openssl-version-check.patch fc6693f3df5a0694610110287a28568a freeradius.confd b3eefdfc466d80c241cd1bb11face405 freeradius.initd 7dd09b1b0631f6bf126517e737c5e576 CVE-2014-2015.patch" sha256sums="3be1e132f243ac53a7d35e0710bd116e8e126b64a1fc1198034195355072f593 freeradius-server-2.2.3.tar.gz +c0f15867924ae73511cd009cb3c53cbd7eda298ff708a54f02d1900da5ebfc06 freeradius-fix-openssl-version-check.patch 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd 719bbe4a44df60e76f68d327f7ee70d4dfd6a95e51f9cb01f850cd4ed153f9de freeradius.initd d70b898811cbbb9d77d9863a7ba9b243b9782bdc767b586e4e9b8787558f1072 CVE-2014-2015.patch" sha512sums="d51208d9926872292ef333bcf4e556a7fd06ac78def846c620422258c18ab77f98a22459a78bb92a35e684469d167a018ba2d47d894c32c7368a57e79fba9ede freeradius-server-2.2.3.tar.gz +77ec50125b38e05ee784b4cf724a31074844ea9c935c0d28aa51bd71e3e8a5399ba5194958f65f8c7f6c501b67ea6560da3869917f661178afbe602062a6fdc6 freeradius-fix-openssl-version-check.patch e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd 57f12f06ef9112817204dec4ab2591bcd4baf3c8a033afadb2376e115911f76045c70b7a2c80b294a83dac4e05b1ff22335a3bcc9af1c0760682622ab2cdbd31 freeradius.initd 62d98d8316e147d57de9ac05c05c9703c08bd23e294b95827c58fe976cb3bc5ce040d9e310ada552cb2350dde9e9e2c97e2160210cc1ab5d1ce35889000d7951 CVE-2014-2015.patch" 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, |