Hello community, here is the log from the commit of package neon for openSUSE:Factory checked in at 2012-06-10 23:19:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neon (Old) and /work/SRC/openSUSE:Factory/.neon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neon", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/neon/neon.changes 2012-05-08 12:28:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.neon.new/neon.changes 2012-06-10 23:20:00.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 6 13:45:57 CEST 2012 - meiss...@suse.de + +- disable explicit openssl version check. openssl 1.0 is stable + api wise. [bnc#764906] + +------------------------------------------------------------------- New: ---- neon-openssl-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neon.spec ++++++ --- /var/tmp/diff_new_pack.3zIzff/_old 2012-06-10 23:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.3zIzff/_new 2012-06-10 23:20:01.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: neon Version: 0.29.6 Release: 0 @@ -41,6 +40,8 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: %{name}-0.28.4-bloat.patch Patch1: neon-aes-ni.patch +# PATCH-FIX-UPSTREAM neon-openssl-version.patch [bnc#764906] -- fix "SSL disabled due to library version mismatch" +Patch2: neon-openssl-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -154,6 +155,8 @@ # disable temporarily (bnc#720601) #%patch1 +%patch2 -p1 + %build rm -f aclocal.m4 ltmain.sh sh autogen.sh ++++++ neon-openssl-version.patch ++++++ Index: neon-0.29.6/src/ne_socket.c =================================================================== --- neon-0.29.6.orig/src/ne_socket.c +++ neon-0.29.6/src/ne_socket.c @@ -1718,12 +1718,16 @@ int ne_sock_connect_ssl(ne_socket *sock, return NE_SOCK_ERROR; } +#if 0 + /* with openssl 1.0 the version checking is not needed anymore + * as compatibility is now better */ /* If runtime library version differs from compile-time version * number in major/minor/fix level, abort soon. */ if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & 0xFFFFF000) { set_error(sock, _("SSL disabled due to library version mismatch")); return NE_SOCK_ERROR; } +#endif sock->ssl = ssl = SSL_new(ctx->ctx); if (!ssl) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
