diff --git a/freeradius-server-opensslversion.patch b/freeradius-server-opensslversion.patch new file mode 100644 index 0000000..1739e70 --- /dev/null +++ b/freeradius-server-opensslversion.patch @@ -0,0 +1,13 @@ +Index: freeradius-server-3.0.3/src/main/version.c +=================================================================== +--- freeradius-server-3.0.3.orig/src/main/version.c ++++ freeradius-server-3.0.3/src/main/version.c +@@ -48,7 +48,7 @@ int ssl_check_consistency(void) + + ssl_linked = SSLeay(); + +- if (ssl_linked != ssl_built) { ++ if ((ssl_linked&~0xfff) != (ssl_built&~0xfff)) { + ERROR("libssl version mismatch. built: %lx linked: %lx", + (unsigned long) ssl_built, + (unsigned long) ssl_linked); diff --git a/freeradius-server.changes b/freeradius-server.changes index eb31e18..0a5c3b8 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 1 10:52:28 UTC 2014 - meissner@suse.com + +- freeradius-server-opensslversion.patch: do not check the minor + version of openssl, minor versions are supposed to be compatible. + bnc#906682 + ------------------------------------------------------------------- Sun Aug 3 18:31:49 UTC 2014 - sfalken@opensuse.org diff --git a/freeradius-server.spec b/freeradius-server.spec index 2c885ab..4f575c0 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -42,6 +42,7 @@ Patch9: freeradius-server-radius-reload-logrotate.patch # PATCH-FIX-SUSE use 'su' logrotate option (bnc#677335) Patch12: freeradius-server-2.1.1-logrotate_su.patch Patch13: freeradius-server-var_run.patch +Patch14: freeradius-server-opensslversion.patch BuildRequires: apache2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -201,6 +202,7 @@ This plugin provides the SQLite support for the FreeRADIUS server project. %patch9 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"