diff --git a/.cvsignore b/.cvsignore index 47f7704..ef32582 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -neon-0.27.0.tar.gz +neon-0.27.2.tar.gz diff --git a/neon-0.25.5-multilib.patch b/neon-0.25.5-multilib.patch deleted file mode 100644 index 5f1e204..0000000 --- a/neon-0.25.5-multilib.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- neon-0.25.5/neon.pc.in.multilib -+++ neon-0.25.5/neon.pc.in -@@ -2,6 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+has_lfs=@NE_FLAG_LFS@ - - Name: neon - Description: HTTP/WebDAV client library ---- neon-0.25.5/neon-config.in.multilib -+++ neon-0.25.5/neon-config.in -@@ -5,7 +5,11 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - includedir=@includedir@ --libdir=@libdir@ -+ -+libdir=`pkg-config --variable=libdir neon` -+CFLAGS=`pkg-config --cflags neon` -+LIBS=`pkg-config --libs neon` -+has_lfs=`pkg-config --variable=has_lfs neon` - - usage() - { -@@ -21,7 +25,7 @@ - --help display this help and exit - --version output version information - --support FEATURE exit with success if feature is supported -- Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@] -+ Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}] - - EOF - -@@ -66,11 +70,10 @@ - ;; - - --cflags) -- echo -I${includedir}/neon @NEON_CFLAGS@ -+ echo ${CFLAGS} - ;; - - --libs) -- LIBS="-lneon @NEON_LIBS@" - # Don't add standard library paths - if test "$prefix" != "/usr"; then - LIBS="-L${libdir} ${LIBS}" -@@ -90,7 +93,7 @@ - zlib|ZLIB) support @NE_FLAG_ZLIB@ ;; - ipv6|IPV6) support @NE_FLAG_IPV6@ ;; - dav|DAV) support @NE_FLAG_DAV@ ;; -- lfs|LFS) support @NE_FLAG_LFS@ ;; -+ lfs|LFS) support ${has_lfs} ;; - *) support no ;; - esac - ;; diff --git a/neon-0.27.0-gssapi.patch b/neon-0.27.0-gssapi.patch deleted file mode 100644 index 82c6275..0000000 --- a/neon-0.27.0-gssapi.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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-0.27.2.tar.gz.asc b/neon-0.27.2.tar.gz.asc new file mode 100644 index 0000000..e7fcea9 --- /dev/null +++ b/neon-0.27.2.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) + +iD8DBQBG+NOHR/aWnQ5EzwwRAozbAJ4tHBvC9xCrIR9cO1NhsWUN1PKDsgCeM+je +gLmyed59MoXOAqFiDWVXtYs= +=blpK +-----END PGP SIGNATURE----- diff --git a/neon.spec b/neon.spec index b9ccca7..559efee 100644 --- a/neon.spec +++ b/neon.spec @@ -1,13 +1,12 @@ Summary: An HTTP and WebDAV client library Name: neon -Version: 0.27.0 -Release: 3 +Version: 0.27.2 +Release: 2 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 @@ -33,7 +32,6 @@ 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" @@ -70,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Tue Sep 25 2007 Joe Orton 0.27.2-2 +- update to 0.27.2 + * Thu Sep 20 2007 Joe Orton 0.27.0-3 - fix Negotiate response verification diff --git a/sources b/sources index a484117..a7104e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29a0467b5d84d3f1d78bb79c7c0e02d4 neon-0.27.0.tar.gz +24d434a4d5d4b6ce8f076039688f60ce neon-0.27.2.tar.gz diff --git a/upstream b/upstream index 47f7704..ef32582 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -neon-0.27.0.tar.gz +neon-0.27.2.tar.gz