- partial merge from HEAD

[packages/rpm.git] / rpm-no-neon.patch

diff --git a/rpm-no-neon.patch b/rpm-no-neon.patch
index 13d3affd8e93607a8713025fe05d0a7ab60ffaf1..d2e411537582b2dd5d6f8ccac7a94101f99aaf37 100644 (file)
--- a/rpm-no-neon.patch
+++ b/rpm-no-neon.patch
@@ -29,9 +29,9 @@
  AC_SUBST(WITH_NEON_SUBDIR)
  AC_SUBST(WITH_NEON_INCLUDE)
  AC_SUBST(WITH_NEON_LIB)
---- rpm-4.4.3/rpmio/rpmdav.c.orig      2005-11-16 01:09:03.000000000 +0100
-+++ rpm-4.4.3/rpmio/rpmdav.c   2005-11-19 00:57:53.058160272 +0100
-@@ -9,24 +9,6 @@
+--- rpm-4.4.6/rpmio/rpmdav.c.orig      2006-03-12 20:24:23.000000000 +0100
++++ rpm-4.4.6/rpmio/rpmdav.c   2006-04-17 18:20:07.597482250 +0200
+@@ -9,31 +9,6 @@
  #include <pthread.h>
  #endif
  
@@ -52,11 +52,18 @@
 -#include "ne_socket.h"
 -#include "ne_string.h"
 -#include "ne_utils.h"
+-
+-/* XXX API changes for neon-0.26.0 */
+-#if !defined(NE_FREE)
+-#define       ne_set_persist(_sess, _flag)
+-#define       ne_propfind_set_private(_pfh, _create_item, NULL) \
+-      ne_propfind_set_private(_pfh, _create_item, NULL, NULL)
+-#endif
 -
  #include <rpmio_internal.h>
  
  #define _RPMDAV_INTERNAL
-@@ -62,1326 +44,6 @@
+@@ -69,1332 +44,6 @@
  }
  
  /* =============================================================== */
@@ -404,8 +411,8 @@
 -static void *fetch_destroy_item(/*@only@*/ struct fetch_resource_s *res)
 -      /*@modifies res @*/
 -{
--    NE_FREE(res->uri);
--    NE_FREE(res->error_reason);
+-    ne_free(res->uri);
+-    ne_free(res->error_reason);
 -    res = _free(res);
 -    return NULL;
 -}
@@ -555,7 +562,7 @@
 -    }
 -}
 -
--static void fetch_results(void *userdata, const char *uri,
+-static void fetch_results(void *userdata, void *uarg,
 -                  const ne_prop_result_set *set)
 -      /*@*/
 -{
@@ -566,7 +573,13 @@
 -    const ne_status *status = NULL;
 -    const char * path = NULL;
 -
+-#if !defined(NE_FREE)
+-    const ne_uri * uri = uarg;
+-    (void) urlPath(uri->path, &path);
+-#else
+-    const char * uri = uarg;
 -    (void) urlPath(uri, &path);
+-#endif
 -    if (path == NULL)
 -      return;
 -
@@ -725,7 +738,7 @@
 -      xx = argvAdd(&ctx->av, val);
 -if (_dav_debug < 0)
 -fprintf(stderr, "*** argvAdd(%p,\"%s\")\n", &ctx->av, val);
--      NE_FREE(val);
+-      ne_free(val);
 -
 -      while (ctx->ac >= ctx->nalloced) {
 -          if (ctx->nalloced <= 0)
@@ -1070,7 +1083,7 @@
 -    rc = ne_read_response_block(fd->req, buf, count);
 -
 -if (_dav_debug < 0) {
--fprintf(stderr, "*** davRead(%p,%p,0x%x) rc 0x%x\n", cookie, buf, count, (unsigned)rc);
+-fprintf(stderr, "*** davRead(%p,%p,0x%x) rc 0x%x\n", cookie, buf, (unsigned)count, (unsigned)rc);
 -#ifdef        DYING
 -hexdump(buf, rc);
 -#endif
@@ -1108,7 +1121,7 @@
 -    rc = (xx == 0 ? count : -1);
 -
 -if (_dav_debug < 0)
--fprintf(stderr, "*** davWrite(%p,%p,0x%x) rc 0x%x\n", cookie, buf, count, rc);
+-fprintf(stderr, "*** davWrite(%p,%p,0x%x) rc 0x%x\n", cookie, buf, (unsigned)count, (unsigned)rc);
 -#ifdef        DYING
 -if (count > 0)
 -hexdump(buf, count);
@@ -1383,7 +1396,7 @@
  /*@unchecked@*/
  int avmagicdir = 0x3607113;
  
-@@ -1504,172 +166,3 @@
+@@ -1517,172 +166,3 @@
  /*@=kepttrans@*/
  }
  /*@=boundswrite@*/