From 47f0acb4729ff142c9012711af4434e649e2a19a Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 20 Sep 2007 15:21:20 +0000 Subject: [PATCH] - fix Negotiate response verification --- mirrors | 1 + neon-0.27.0-gssapi.patch | 23 +++++++++++++++++++++++ neon.spec | 13 +++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 mirrors create mode 100644 neon-0.27.0-gssapi.patch diff --git a/mirrors b/mirrors new file mode 100644 index 0000000..7b748fe --- /dev/null +++ b/mirrors @@ -0,0 +1 @@ +http://www.webdav.org/neon/ diff --git a/neon-0.27.0-gssapi.patch b/neon-0.27.0-gssapi.patch new file mode 100644 index 0000000..82c6275 --- /dev/null +++ b/neon-0.27.0-gssapi.patch @@ -0,0 +1,23 @@ +--- neon-0.27.0/src/ne_auth.c.gssapi ++++ neon-0.27.0/src/ne_auth.c +@@ -532,7 +532,7 @@ static int verify_negotiate_response(str + char *duphdr = ne_strdup(hdr); + char *sep, *ptr = strchr(duphdr, ' '); + int ret; +- ne_buffer *errmsg; ++ ne_buffer *errmsg = NULL; + + if (strncmp(hdr, "Negotiate", ptr - duphdr) != 0) { + ne_set_error(sess->sess, _("Negotiate response verification failed: " +@@ -560,8 +560,10 @@ static int verify_negotiate_response(str + ne_set_error(sess->sess, _("Negotiate response verification failure: %s"), + errmsg->data); + } +- ne_buffer_destroy(errmsg); ++ ++ if (errmsg) ne_buffer_destroy(errmsg); + ne_free(duphdr); ++ + return ret ? NE_ERROR : NE_OK; + } + #endif diff --git a/neon.spec b/neon.spec index 1cf54f3..b9ccca7 100644 --- a/neon.spec +++ b/neon.spec @@ -1,12 +1,13 @@ Summary: An HTTP and WebDAV client library Name: neon Version: 0.27.0 -Release: 2 +Release: 3 License: LGPLv2+ Group: System Environment/Libraries URL: http://www.webdav.org/neon/ Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz Patch0: neon-0.27.0-multilib.patch +Patch1: neon-0.27.0-gssapi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel BuildRequires: pkgconfig @@ -32,16 +33,17 @@ The development library for the C language HTTP and WebDAV client library. %prep %setup -q %patch0 -p1 -b .multilib +%patch1 -p1 -b .gssapi %build export CC="%{__cc} -pthread" -%configure --with-ssl --with-expat --enable-shared --enable-warnings \ - --enable-threadsafe-ssl=posix +%configure --with-expat --enable-shared --enable-warnings \ + --with-ssl=openssl --enable-threadsafe-ssl=posix make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Thu Sep 20 2007 Joe Orton 0.27.0-3 +- fix Negotiate response verification + * Thu Aug 30 2007 Joe Orton 0.27.0-2 - enable OpenSSL thread-safety hooks