X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-no-neon.patch;h=27671e3721fd051b0491a37c677201b8fb019119;hp=13d3affd8e93607a8713025fe05d0a7ab60ffaf1;hb=2f6105629dbb5f5197bd38eda13b6cd72f2041cd;hpb=dc6aae45ce81296b203ddde08f363c84eec57dfa diff --git a/rpm-no-neon.patch b/rpm-no-neon.patch index 13d3aff..27671e3 100644 --- a/rpm-no-neon.patch +++ b/rpm-no-neon.patch @@ -1,9 +1,14 @@ ---- rpm-4.4.2/configure.ac.orig 2005-07-23 14:06:59.692430464 +0200 -+++ rpm-4.4.2/configure.ac 2005-07-23 14:08:45.591331384 +0200 -@@ -516,28 +516,6 @@ - WITH_NEON_SUBDIR= - WITH_NEON_INCLUDE= - WITH_NEON_LIB= +--- rpm-4.4.7.org/configure.ac 2006-10-17 22:12:03.110624000 +0200 ++++ rpm-4.4.7/configure.ac 2006-10-17 22:12:43.117124500 +0200 +@@ -530,33 +530,6 @@ + AC_SUBST(WITH_BEECRYPT_INCLUDE) + AC_SUBST(WITH_BEECRYPT_LIB) + +-#================= +-# Check for neon library. Prefer external, otherwise internal. +-WITH_NEON_SUBDIR= +-WITH_NEON_INCLUDE= +-WITH_NEON_LIB= -AC_CHECK_HEADER([neon/ne_session.h], [ - AC_CHECK_LIB(neon, ne_session_create, [ - AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).]) @@ -29,9 +34,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.8/rpmio/rpmdav.c.orig 2007-02-20 00:51:07.000000000 +0100 ++++ rpm-4.4.8/rpmio/rpmdav.c 2007-04-08 20:07:07.814412143 +0200 +@@ -9,31 +9,6 @@ #include #endif @@ -52,25 +57,43 @@ -#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 #define _RPMDAV_INTERNAL -@@ -62,1326 +44,6 @@ +@@ -69,1439 +44,6 @@ } /* =============================================================== */ --static int davFree(urlinfo u) +-int davFree(urlinfo u) - /*@globals internalState @*/ - /*@modifies u, internalState @*/ -{ -- if (u != NULL && u->sess != NULL) { -- u->capabilities = _free(u->capabilities); -- if (u->lockstore != NULL) -- ne_lockstore_destroy(u->lockstore); -- u->lockstore = NULL; -- ne_session_destroy(u->sess); -- u->sess = NULL; +- if (u != NULL) { +- if (u->sess != NULL) { +- ne_session_destroy(u->sess); +- u->sess = NULL; +- } +- switch (u->urltype) { +- default: +- /*@notreached@*/ break; +- case URL_IS_HTTPS: +- case URL_IS_HTTP: +- case URL_IS_HKP: +- u->capabilities = _free(u->capabilities); +- if (u->lockstore != NULL) +- ne_lockstore_destroy(u->lockstore); +- u->lockstore = NULL; +- ne_sock_exit(); +- break; +- } - } - return 0; -} @@ -270,18 +293,36 @@ - /* HACK: where should server capabilities be read? */ - (void) urlPath(u->url, &path); - /* HACK: perhaps capture Allow: tag, look for PUT permitted. */ +- /* XXX [hdr] Allow: GET,HEAD,POST,OPTIONS,TRACE */ - rc = ne_options(u->sess, path, u->capabilities); - switch (rc) { - case NE_OK: -- break; +- { ne_server_capabilities *cap = u->capabilities; +- if (cap->dav_class1) +- u->allow |= RPMURL_SERVER_HASDAVCLASS1; +- else +- u->allow &= ~RPMURL_SERVER_HASDAVCLASS1; +- if (cap->dav_class2) +- u->allow |= RPMURL_SERVER_HASDAVCLASS2; +- else +- u->allow &= ~RPMURL_SERVER_HASDAVCLASS2; +- if (cap->dav_executable) +- u->allow |= RPMURL_SERVER_HASDAVEXEC; +- else +- u->allow &= ~RPMURL_SERVER_HASDAVEXEC; +- } break; - case NE_ERROR: - /* HACK: "301 Moved Permanently" on empty subdir. */ - if (!strncmp("301 ", ne_get_error(u->sess), sizeof("301 ")-1)) - break; -- /*@fallthrough@*/ -- case NE_CONNECT: +- errno = EIO; /* HACK: more precise errno. */ +- goto bottom; - case NE_LOOKUP: +- errno = ENOENT; /* HACK: errno same as non-existent path. */ +- goto bottom; +- case NE_CONNECT: /* HACK: errno set already? */ - default: +-bottom: -if (_dav_debug) -fprintf(stderr, "*** Connect to %s:%d failed(%d):\n\t%s\n", - u->host, u->port, rc, ne_get_error(u->sess)); @@ -369,7 +410,7 @@ - -exit: -/*@-boundswrite@*/ -- if (rc == 0 && uret != NULL) +- if (uret != NULL) - *uret = urlLink(u, __FUNCTION__); -/*@=boundswrite@*/ - u = urlFree(u, "urlSplit (davInit)"); @@ -404,8 +445,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; -} @@ -444,6 +485,8 @@ - int ac; - int nalloced; - ARGV_t av; +-/*@null@*/ /*@shared@*/ +- struct stat *st; - mode_t * modes; - size_t * sizes; - time_t * mtimes; @@ -471,7 +514,7 @@ -} - -/*@null@*/ --static void *fetch_create_context(const char *uri) +-static void *fetch_create_context(const char *uri, /*@null@*/ struct stat *st) - /*@globals internalState @*/ - /*@modifies internalState @*/ -{ @@ -486,6 +529,8 @@ - ctx = ne_calloc(sizeof(*ctx)); - ctx->uri = xstrdup(uri); - ctx->u = urlLink(u, __FUNCTION__); +- if ((ctx->st = st) != NULL) +- memset(ctx->st, 0, sizeof(*ctx->st)); - return ctx; -} - @@ -555,7 +600,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 +611,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; - @@ -682,7 +733,7 @@ - (void) urlPath(u->url, &path); - pfh = ne_propfind_create(u->sess, ctx->uri, depth); - -- /* HACK: need to set u->httpHasRange here. */ +- /* HACK: need to set RPMURL_SERVER_HASRANGE in u->allow here. */ - - ctx->resrock = resrock; - ctx->include_target = include_target; @@ -725,7 +776,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) @@ -762,10 +813,73 @@ - current = fetch_destroy_item(current); - } - ctx->resrock = NULL; /* HACK: avoid leaving stack reference. */ +- /* HACK realloc to truncate modes/sizes/mtimes */ - - return rc; -} - +-/* HACK this should be rewritten to use davReq/davResp w callbacks. */ +-static int davHEAD(urlinfo u, struct stat *st) +- /*@modifies *st @*/ +-{ +- ne_request *req; +- const char *htag; +- const char *value = NULL; +- int rc; +- +- st->st_mode = S_IFREG; +- st->st_blksize = 4 * 1024; /* HACK correct for linux ext */ +- st->st_size = -1; +- st->st_atime = -1; +- st->st_mtime = -1; +- st->st_ctime = -1; +- +- req = ne_request_create(u->sess, "HEAD", u->url); +- +- rc = ne_request_dispatch(req); +- switch (rc) { +- default: +- goto exit; +- /*@notreached@*/ +- case NE_OK: +- if (ne_get_status(req)->klass != 2) { +- rc = NE_ERROR; +- goto exit; +- } +- break; +- } +- +-#ifdef NOTYET +- htag = "ETag"; +- value = ne_get_response_header(req, htag); +- if (value) { +- /* inode-size-mtime */ +- } +-#endif +- +- htag = "Content-Length"; +-#if defined(HAVE_NEON_NE_GET_RESPONSE_HEADER) +- value = ne_get_response_header(req, htag); +-#endif +- if (value) { +- st->st_size = strtoll(value, NULL, 10); +- st->st_blocks = (st->st_size + 511)/512; +- } +- +- htag = "Last-Modified"; +-#if defined(HAVE_NEON_NE_GET_RESPONSE_HEADER) +- value = ne_get_response_header(req, htag); +-#endif +- if (value) { +- st->st_mtime = ne_httpdate_parse(value); +- st->st_atime = st->st_ctime = st->st_mtime; /* HACK */ +- } +- +-exit: +- ne_request_destroy(req); +- return rc; +-} +- -static int davNLST(struct fetch_context_s * ctx) - /*@globals internalState @*/ - /*@modifies ctx, internalState @*/ @@ -778,11 +892,19 @@ - if (rc || u == NULL) - goto exit; - -- rc = davFetch(u, ctx); +-/* HACK do PROPFIND through davFetch iff enabled, otherwise HEAD Content-length/ETag/Last-Modified */ +- if (u->allow & RPMURL_SERVER_HASDAV) +- rc = davFetch(u, ctx); /* use PROPFIND to get contentLength */ +- else +- rc = davHEAD(u, ctx->st); /* use HEAD to get contentLength */ +- - switch (rc) { - case NE_OK: - break; - case NE_ERROR: +- /* HACK: "405 Method Not Allowed" for PROPFIND on non-DAV servers. */ +- /* XXX #206066 OPTIONS is ok, but PROPFIND from Stat() fails. */ +- /* rpm -qp --rpmiodebug --davdebug http://people.freedesktop.org/~sandmann/metacity-2.16.0-2.fc6/i386/metacity-2.16.0-2.fc6.i386.rpm */ - /* HACK: "301 Moved Permanently" on empty subdir. */ - if (!strncmp("301 ", ne_get_error(u->sess), sizeof("301 ")-1)) - break; @@ -795,8 +917,7 @@ - } - -exit: -- if (rc) -- xx = davFree(u); +- xx = davFree(u); - return rc; -} - @@ -847,9 +968,9 @@ -if (_dav_debug < 0) -fprintf(stderr, "*** u %p Accept-Ranges: %s\n", u, value); - if (!strcmp(value, "bytes")) -- u->httpHasRange = 1; +- u->allow |= RPMURL_SERVER_HASRANGE; - if (!strcmp(value, "none")) -- u->httpHasRange = 0; +- u->allow &= ~RPMURL_SERVER_HASRANGE; -} -/*@=mustmod@*/ - @@ -1070,7 +1191,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 +1229,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); @@ -1286,8 +1407,9 @@ - int rc = -1; - -/* HACK: neon really wants collections with trailing '/' */ -- ctx = fetch_create_context(path); +- ctx = fetch_create_context(path, st); - if (ctx == NULL) { +-fprintf(stderr, "==> %s fetch_create_context ctx %p\n", __FUNCTION__, ctx); -/* HACK: errno = ??? */ - goto exit; - } @@ -1297,10 +1419,11 @@ - goto exit; - } - -- memset(st, 0, sizeof(*st)); -- st->st_mode = ctx->modes[0]; -- st->st_size = ctx->sizes[0]; -- st->st_mtime = ctx->mtimes[0]; +- if (st->st_mode == 0) +- st->st_mode = (ctx->ac > 1 ? S_IFDIR : S_IFREG); +- st->st_size = (ctx->sizes ? ctx->sizes[0] : st->st_size); +- st->st_mtime = (ctx->mtimes ? ctx->mtimes[0] : st->st_mtime); +- st->st_atime = st->st_ctime = st->st_mtime; /* HACK */ - if (S_ISDIR(st->st_mode)) { - st->st_nlink = 2; - st->st_mode |= 0755; @@ -1313,9 +1436,10 @@ - /* XXX fts(3) needs/uses st_ino, make something up for now. */ - if (st->st_ino == 0) - st->st_ino = dav_st_ino++; +- +-exit: -if (_dav_debug < 0) -fprintf(stderr, "*** davStat(%s) rc %d\n%s", path, rc, statstr(st, buf)); --exit: - ctx = fetch_destroy_context(ctx); - return rc; -} @@ -1331,7 +1455,7 @@ - int rc = -1; - -/* HACK: neon really wants collections with trailing '/' */ -- ctx = fetch_create_context(path); +- ctx = fetch_create_context(path, st); - if (ctx == NULL) { -/* HACK: errno = ??? */ - goto exit; @@ -1342,10 +1466,11 @@ - goto exit; - } - -- memset(st, 0, sizeof(*st)); -- st->st_mode = ctx->modes[0]; -- st->st_size = ctx->sizes[0]; -- st->st_mtime = ctx->mtimes[0]; +- if (st->st_mode == 0) +- st->st_mode = (ctx->ac > 1 ? S_IFDIR : S_IFREG); +- st->st_size = (ctx->sizes ? ctx->sizes[0] : st->st_size); +- st->st_mtime = (ctx->mtimes ? ctx->mtimes[0] : st->st_mtime); +- st->st_atime = st->st_ctime = st->st_mtime; /* HACK */ - if (S_ISDIR(st->st_mode)) { - st->st_nlink = 2; - st->st_mode |= 0755; @@ -1383,11 +1508,10 @@ /*@unchecked@*/ int avmagicdir = 0x3607113; -@@ -1504,172 +166,3 @@ - /*@=kepttrans@*/ +@@ -1625,171 +167,3 @@ } /*@=boundswrite@*/ -- + -/* =============================================================== */ -/*@unchecked@*/ -int davmagicdir = 0x8440291; @@ -1442,7 +1566,7 @@ - dp->d_reclen = 0; /* W2DO? */ - -#if !(defined(hpux) || defined(__hpux) || defined(sun)) --#if !defined(__APPLE__) +-#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) - dp->d_off = 0; /* W2DO? */ -#endif -/*@-boundsread@*/ @@ -1486,7 +1610,7 @@ -fprintf(stderr, "*** davOpendir(%s)\n", path); - - /* Load DAV collection into argv. */ -- ctx = fetch_create_context(path); +- ctx = fetch_create_context(path, NULL); - if (ctx == NULL) { -/* HACK: errno = ??? */ - return NULL; @@ -1556,9 +1680,23 @@ -/*@=kepttrans@*/ -} -/*@=modfilesys@*/ ---- rpm-4.4.3/rpmio/rpmdav.h.orig 2005-10-11 21:13:59.000000000 +0200 -+++ rpm-4.4.3/rpmio/rpmdav.h 2005-11-19 01:07:54.224769056 +0100 -@@ -80,133 +80,6 @@ +diff -ur rpm-4.4.7.org/rpmio/rpmdav.h rpm-4.4.7/rpmio/rpmdav.h +--- rpm-4.4.7.org/rpmio/rpmdav.h 2005-10-11 21:13:59.000000000 +0200 ++++ rpm-4.4.7/rpmio/rpmdav.h 2006-10-17 22:35:33.742783250 +0200 +@@ -41,12 +41,6 @@ + extern int avmagicdir; + #define ISAVMAGIC(_dir) (!memcmp((_dir), &avmagicdir, sizeof(avmagicdir))) + +-/** +- */ +-/*@unchecked@*/ +-extern int davmagicdir; +-#define ISDAVMAGIC(_dir) (!memcmp((_dir), &davmagicdir, sizeof(davmagicdir))) +- + #ifdef __cplusplus + extern "C" { + #endif +@@ -80,133 +74,6 @@ /*@globals fileSystem, internalState @*/ /*@modifies fileSystem, internalState @*/; @@ -1692,9 +1830,10 @@ #ifdef __cplusplus } #endif ---- rpm-4.4.3/rpmio/rpmio.c.orig 2005-11-16 01:05:39.000000000 +0100 -+++ rpm-4.4.3/rpmio/rpmio.c 2005-11-19 01:03:10.769860752 +0100 -@@ -371,13 +371,6 @@ +diff -ur rpm-4.4.7.org/rpmio/rpmio.c rpm-4.4.7/rpmio/rpmio.c +--- rpm-4.4.7.org/rpmio/rpmio.c 2006-08-08 08:55:01.000000000 +0200 ++++ rpm-4.4.7/rpmio/rpmio.c 2006-10-17 22:18:38.135311750 +0200 +@@ -406,13 +406,6 @@ fdstat_enter(fd, FDSTAT_READ); /*@-boundswrite@*/ @@ -1708,7 +1847,7 @@ rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count)); /*@=boundswrite@*/ fdstat_exit(fd, FDSTAT_READ, rc); -@@ -405,10 +398,6 @@ +@@ -440,10 +433,6 @@ fdstat_enter(fd, FDSTAT_WRITE); /*@-boundsread@*/ @@ -1719,7 +1858,7 @@ rc = write(fdno, buf, (count > fd->bytesRemain ? fd->bytesRemain : count)); /*@=boundsread@*/ fdstat_exit(fd, FDSTAT_WRITE, rc); -@@ -455,11 +444,6 @@ +@@ -490,11 +479,6 @@ fdSetFdno(fd, -1); fdstat_enter(fd, FDSTAT_CLOSE); @@ -1731,7 +1870,7 @@ rc = ((fdno >= 0) ? close(fdno) : -2); /*@=branchstate@*/ fdstat_exit(fd, FDSTAT_CLOSE, rc); -@@ -512,10 +496,6 @@ +@@ -547,10 +531,6 @@ FD_ZERO(&wrfds); #endif @@ -1742,7 +1881,7 @@ if ((fdno = fdFileno(fd)) < 0) return -1; /* XXX W2DO? */ -@@ -567,10 +547,6 @@ +@@ -602,10 +582,6 @@ FD_ZERO(&rdfds); #endif @@ -1753,7 +1892,7 @@ if ((fdno = fdFileno(fd)) < 0) return -1; /* XXX W2DO? */ -@@ -1566,154 +1542,6 @@ +@@ -1758,159 +1734,6 @@ return rc; } @@ -1794,6 +1933,7 @@ - urlinfo u; - const char * host; - const char * path; +- char hthost[NI_MAXHOST]; - int port; - int rc; - char * req; @@ -1806,6 +1946,10 @@ - - if (((host = (u->proxyh ? u->proxyh : u->host)) == NULL)) - return FTPERR_BAD_HOSTNAME; +- if (strchr(host, ':')) +- sprintf(hthost, "[%s]", host); +- else +- strcpy(hthost, host); - - if ((port = (u->proxyp > 0 ? u->proxyp : u->port)) < 0) port = 80; - path = (u->proxyh || u->proxyp > 0) ? u->url : httpArg; @@ -1835,7 +1979,7 @@ -Accept: text/plain\r\n\ -Transfer-Encoding: chunked\r\n\ -\r\n\ --") + strlen(httpCmd) + strlen(path) + sizeof(VERSION) + strlen(host) + 20; +-") + strlen(httpCmd) + strlen(path) + sizeof(VERSION) + strlen(hthost) + 20; - -/*@-boundswrite@*/ - req = alloca(len); @@ -1849,7 +1993,7 @@ -Accept: text/plain\r\n\ -Transfer-Encoding: chunked\r\n\ -\r\n\ --", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, host, port); +-", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port); -} else { - sprintf(req, "\ -%s %s HTTP/1.%d\r\n\ @@ -1857,7 +2001,7 @@ -Host: %s:%d\r\n\ -Accept: text/plain\r\n\ -\r\n\ --", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, host, port); +-", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port); -} -/*@=boundswrite@*/ - @@ -1908,7 +2052,7 @@ /* XXX DYING: unused */ void * ufdGetUrlinfo(FD_t fd) { -@@ -2071,29 +1899,6 @@ +@@ -2268,29 +2091,6 @@ fd->wr_chunked = 0; } break; @@ -1938,7 +2082,7 @@ case URL_IS_DASH: assert(!(flags & O_RDWR)); fd = fdDup( ((flags & O_WRONLY) ? STDOUT_FILENO : STDIN_FILENO) ); -@@ -2711,10 +2516,8 @@ +@@ -2908,10 +2708,8 @@ if (fd->nfps > 0 && fpno == -1 && fd->fps[fd->nfps-1].io == ufdio && fd->fps[fd->nfps-1].fp == fp && @@ -1950,7 +2094,7 @@ if (fp) rc = fflush(fp); fd->nfps--; -@@ -2724,26 +2527,9 @@ +@@ -2921,26 +2719,9 @@ /*@-usereleased@*/ if (fdGetFdno(fd) >= 0) break; @@ -1977,14 +2121,14 @@ rc = fclose(fp); } fdPop(fd); -@@ -2992,18 +2778,10 @@ +@@ -3195,18 +2976,9 @@ return NULL; } } else { - FILE *fp; - int fdno; - int isHTTP = 0; - +- /* XXX gzdio and bzdio here too */ switch (urlIsURL(path)) { @@ -1996,7 +2140,7 @@ case URL_IS_PATH: case URL_IS_DASH: case URL_IS_FTP: -@@ -3011,7 +2789,7 @@ +@@ -3214,7 +2986,7 @@ if (_rpmio_debug) fprintf(stderr, "*** Fopen ufdio path %s fmode %s\n", path, fmode); fd = ufdOpen(path, flags, perms); @@ -2005,7 +2149,7 @@ return fd; break; default: -@@ -3020,15 +2798,6 @@ +@@ -3223,15 +2995,6 @@ return NULL; /*@notreached@*/ break; } @@ -2021,7 +2165,7 @@ } /*@=branchstate@*/ -@@ -3064,10 +2833,6 @@ +@@ -3267,10 +3030,6 @@ int i, rc = 0; if (fd == NULL) return -1; @@ -2032,7 +2176,7 @@ for (i = fd->nfps; rc == 0 && i >= 0; i--) { /*@-boundsread@*/ FDSTACK_t * fps = &fd->fps[i]; -@@ -3102,9 +2867,6 @@ +@@ -3305,9 +3064,6 @@ { int i, rc = -1; @@ -2042,10 +2186,10 @@ for (i = fd->nfps ; rc == -1 && i >= 0; i--) { /*@-boundsread@*/ rc = fd->fps[i].fdno; -diff -ur rpm-4.4.1/rpmio/rpmio_internal.h rpm-4.4.1-no-neon/rpmio/rpmio_internal.h ---- rpm-4.4.1/rpmio/rpmio_internal.h 2005-02-08 18:14:20.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/rpmio_internal.h 2005-06-19 20:34:07.006758008 +0200 -@@ -152,7 +152,6 @@ +diff -ur rpm-4.4.7.org/rpmio/rpmio_internal.h rpm-4.4.7/rpmio/rpmio_internal.h +--- rpm-4.4.7.org/rpmio/rpmio_internal.h 2006-06-18 20:54:59.000000000 +0200 ++++ rpm-4.4.7/rpmio/rpmio_internal.h 2006-10-17 22:18:51.308135000 +0200 +@@ -157,7 +157,6 @@ /*@dependent@*/ void * url; /* ufdio: URL info */ /*@relnull@*/ @@ -2053,9 +2197,9 @@ diff -ur rpm-4.4.1/rpmio/rpmio_internal.h rpm-4.4.1-no-neon/rpmio/rpmio_internal int rd_timeoutsecs; /* ufdRead: per FD_t timer */ ssize_t bytesRemain; /* ufdio: */ -diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c ---- rpm-4.4.1/rpmio/rpmrpc.c 2005-01-26 06:16:09.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/rpmrpc.c 2005-06-19 20:34:07.008757704 +0200 +diff -ur rpm-4.4.7.org/rpmio/rpmrpc.c rpm-4.4.7/rpmio/rpmrpc.c +--- rpm-4.4.7.org/rpmio/rpmrpc.c 2006-10-03 06:38:01.000000000 +0200 ++++ rpm-4.4.7/rpmio/rpmrpc.c 2006-10-17 22:35:59.040364250 +0200 @@ -91,10 +91,6 @@ case URL_IS_FTP: return ftpMkdir(path, mode); @@ -2067,7 +2211,7 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -118,14 +114,6 @@ +@@ -118,15 +114,6 @@ case URL_IS_FTP: return ftpChdir(path); /*@notreached@*/ break; @@ -2076,13 +2220,14 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c -#ifdef NOTYET - return davChdir(path); -#else +- errno = EINVAL; /* XXX W2DO? */ - return -2; -#endif - /*@notreached@*/ break; case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -149,10 +137,6 @@ +@@ -151,10 +138,6 @@ case URL_IS_FTP: return ftpRmdir(path); /*@notreached@*/ break; @@ -2093,7 +2238,16 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -180,10 +164,6 @@ +@@ -185,8 +168,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -208,10 +189,6 @@ oldut = urlPath(oldpath, &oe); switch (oldut) { @@ -2104,7 +2258,34 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_FTP: /* XXX WRONG WRONG WRONG */ case URL_IS_PATH: case URL_IS_UNKNOWN: -@@ -278,10 +258,6 @@ +@@ -233,8 +210,6 @@ + return -2; + return ftpRename(oldpath, newpath); + /*@notreached@*/ break; +- case URL_IS_HTTPS: /* XXX WRONG WRONG WRONG */ +- case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_PATH: + oldpath = oe; + newpath = ne; +@@ -258,8 +233,6 @@ + + oldut = urlPath(oldpath, &oe); + switch (oldut) { +- case URL_IS_HTTPS: /* XXX WRONG WRONG WRONG */ +- case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_FTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_PATH: + case URL_IS_UNKNOWN: +@@ -273,8 +246,6 @@ + + newut = urlPath(newpath, &ne); + switch (newut) { +- case URL_IS_HTTPS: /* XXX WRONG WRONG WRONG */ +- case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_FTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_PATH: + if (_rpmio_debug) +@@ -306,10 +277,6 @@ case URL_IS_FTP: return ftpUnlink(path); /*@notreached@*/ break; @@ -2115,7 +2296,7 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -1280,10 +1256,6 @@ +@@ -1308,10 +1275,6 @@ case URL_IS_FTP: return ftpStat(path, st); /*@notreached@*/ break; @@ -2126,7 +2307,7 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -1309,10 +1281,6 @@ +@@ -1338,10 +1301,6 @@ case URL_IS_FTP: return ftpLstat(path, st); /*@notreached@*/ break; @@ -2137,7 +2318,79 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -1336,14 +1304,6 @@ +@@ -1373,8 +1332,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1399,8 +1356,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1425,8 +1380,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1451,8 +1404,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1477,8 +1428,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1503,8 +1452,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1529,8 +1476,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1558,8 +1503,6 @@ + case URL_IS_DASH: + case URL_IS_HKP: + case URL_IS_FTP: /* XXX TODO: implement. */ +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ + return -2; +@@ -1577,14 +1520,6 @@ case URL_IS_FTP: return ftpReadlink(path, buf, bufsiz); /*@notreached@*/ break; @@ -2152,7 +2405,25 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -1487,10 +1447,6 @@ +@@ -1617,8 +1552,6 @@ + break; + case URL_IS_DASH: + case URL_IS_HKP: +- case URL_IS_HTTPS: /* XXX TODO: implement. */ +- case URL_IS_HTTP: /* XXX TODO: implement. */ + case URL_IS_FTP: /* XXX TODO: implement. */ + default: + errno = EINVAL; /* XXX W2DO? */ +@@ -1685,8 +1618,6 @@ + fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)errfunc, pglob); + /*@=castfcnptr@*/ + switch (ut) { +- case URL_IS_HTTPS: +- case URL_IS_HTTP: + case URL_IS_FTP: + /*@-type@*/ + pglob->gl_closedir = Closedir; +@@ -1730,10 +1661,6 @@ case URL_IS_FTP: return ftpOpendir(path); /*@notreached@*/ break; @@ -2163,7 +2434,7 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c case URL_IS_PATH: path = lpath; /*@fallthrough@*/ -@@ -1515,8 +1471,6 @@ +@@ -1758,8 +1685,6 @@ return NULL; if (ISAVMAGIC(dir)) return avReaddir(dir); @@ -2172,7 +2443,7 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c return readdir(dir); } -@@ -1528,7 +1482,5 @@ +@@ -1771,8 +1696,6 @@ return 0; if (ISAVMAGIC(dir)) return avClosedir(dir); @@ -2180,18 +2451,20 @@ diff -ur rpm-4.4.1/rpmio/rpmrpc.c rpm-4.4.1-no-neon/rpmio/rpmrpc.c - return davClosedir(dir); return closedir(dir); } -diff -ur rpm-4.4.1/rpmio/tget.c rpm-4.4.1-no-neon/rpmio/tget.c ---- rpm-4.4.1/rpmio/tget.c 2004-11-19 17:52:58.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/tget.c 2005-06-19 20:34:07.009757552 +0200 -@@ -9,7 +9,6 @@ + +diff -ur rpm-4.4.7.org/rpmio/tget.c rpm-4.4.7/rpmio/tget.c +--- rpm-4.4.7.org/rpmio/tget.c 2004-11-19 17:52:58.000000000 +0100 ++++ rpm-4.4.7/rpmio/tget.c 2006-10-17 22:20:47.995427500 +0200 +@@ -9,8 +9,6 @@ static int _debug = 0; -int noNeon; - +- #define HTTPSPATH "https://localhost/test.txt" #define HTTPPATH "http://localhost/test.txt" -@@ -40,8 +39,6 @@ + #define FTPPATH "ftp://localhost/test.txt" +@@ -40,8 +38,6 @@ { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL }, { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, N_("debug protocol data stream"), NULL}, @@ -2200,18 +2473,19 @@ diff -ur rpm-4.4.1/rpmio/tget.c rpm-4.4.1-no-neon/rpmio/tget.c { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, N_("debug rpmio I/O"), NULL}, { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, -diff -ur rpm-4.4.1/rpmio/tglob.c rpm-4.4.1-no-neon/rpmio/tglob.c ---- rpm-4.4.1/rpmio/tglob.c 2004-11-19 17:53:05.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/tglob.c 2005-06-19 20:34:07.010757400 +0200 -@@ -9,7 +9,6 @@ +diff -ur rpm-4.4.7.org/rpmio/tglob.c rpm-4.4.7/rpmio/tglob.c +--- rpm-4.4.7.org/rpmio/tglob.c 2004-11-19 17:53:05.000000000 +0100 ++++ rpm-4.4.7/rpmio/tglob.c 2006-10-17 22:21:01.712284750 +0200 +@@ -9,8 +9,6 @@ static int _debug = 0; -int noNeon; - +- #define HTTPSPATH "https://localhost/rawhide/test/*.rpm" #if 0 -@@ -52,8 +51,6 @@ + #define HTTPPATH "http://localhost/rawhide/test/*.rpm" +@@ -52,8 +50,6 @@ { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL }, { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, N_("debug protocol data stream"), NULL}, @@ -2220,18 +2494,19 @@ diff -ur rpm-4.4.1/rpmio/tglob.c rpm-4.4.1-no-neon/rpmio/tglob.c { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, N_("debug rpmio I/O"), NULL}, { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, -diff -ur rpm-4.4.1/rpmio/thkp.c rpm-4.4.1-no-neon/rpmio/thkp.c ---- rpm-4.4.1/rpmio/thkp.c 2005-01-04 17:35:12.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/thkp.c 2005-06-19 20:34:07.012757096 +0200 -@@ -10,7 +10,6 @@ +diff -ur rpm-4.4.7.org/rpmio/thkp.c rpm-4.4.7/rpmio/thkp.c +--- rpm-4.4.7.org/rpmio/thkp.c 2005-01-04 17:35:12.000000000 +0100 ++++ rpm-4.4.7/rpmio/thkp.c 2006-10-17 22:21:10.696846250 +0200 +@@ -10,8 +10,6 @@ static int _debug = 0; static int _printing = 0; -int noNeon; - +- #if 0 #define HKPPATH "hkp://pgp.mit.edu:11371/pks/lookup?op=get&search=0xF5C75256" -@@ -95,8 +94,6 @@ + #else +@@ -95,8 +93,6 @@ N_("debug protocol data stream"), NULL}, { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, N_("debug protocol data stream"), NULL}, @@ -2240,18 +2515,19 @@ diff -ur rpm-4.4.1/rpmio/thkp.c rpm-4.4.1-no-neon/rpmio/thkp.c { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, N_("debug rpmio I/O"), NULL}, { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, -diff -ur rpm-4.4.1/rpmio/tput.c rpm-4.4.1-no-neon/rpmio/tput.c ---- rpm-4.4.1/rpmio/tput.c 2004-11-19 17:53:11.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/tput.c 2005-06-19 20:34:07.013756944 +0200 -@@ -9,7 +9,6 @@ +diff -ur rpm-4.4.7.org/rpmio/tput.c rpm-4.4.7/rpmio/tput.c +--- rpm-4.4.7.org/rpmio/tput.c 2004-11-19 17:53:11.000000000 +0100 ++++ rpm-4.4.7/rpmio/tput.c 2006-10-17 22:21:25.841792750 +0200 +@@ -9,8 +9,6 @@ static int _debug = 0; -int noNeon; - +- #define HTTPSPATH "https://localhost/rawhide/toad/tput.txt" #define HTTPPATH "http://localhost/rawhide/toad/tput.txt" -@@ -100,8 +99,6 @@ + #define FTPPATH "ftp://localhost/home/test/tput.txt" +@@ -100,8 +98,6 @@ { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL }, { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, N_("debug protocol data stream"), NULL}, @@ -2260,38 +2536,17 @@ diff -ur rpm-4.4.1/rpmio/tput.c rpm-4.4.1-no-neon/rpmio/tput.c { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, N_("debug rpmio I/O"), NULL}, { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, -diff -ur rpm-4.4.1/rpmio/tring.c rpm-4.4.1-no-neon/rpmio/tring.c ---- rpm-4.4.1/rpmio/tring.c 2004-11-28 21:41:04.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/tring.c 2005-06-19 20:34:07.013756944 +0200 -@@ -5,7 +5,6 @@ - - static int printing = 1; - static int _debug = 0; --int noNeon; - - static struct poptOption optionsTable[] = { - { "print", 'p', POPT_ARG_VAL, &printing, 1, NULL, NULL }, -@@ -13,8 +12,6 @@ - { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL }, - { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, - N_("debug protocol data stream"), NULL}, -- { "noneon", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noNeon, 1, -- N_("disable use of libneon for HTTP"), NULL}, - { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, - N_("debug rpmio I/O"), NULL}, - { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, -diff -ur rpm-4.4.1/rpmio/url.c rpm-4.4.1-no-neon/rpmio/url.c ---- rpm-4.4.1/rpmio/url.c 2004-11-28 21:41:31.000000000 +0100 -+++ rpm-4.4.1-no-neon/rpmio/url.c 2005-06-19 20:37:11.810663544 +0200 -@@ -148,7 +148,6 @@ - } - if (u->sess != NULL) { - /* HACK: neon include has prototype. */ -- ne_session_destroy(u->sess); - u->sess = NULL; +--- rpm-4.4.8/rpmio/url.c.orig 2007-01-20 21:33:50.000000000 +0100 ++++ rpm-4.4.8/rpmio/url.c 2007-04-08 19:57:45.646376012 +0200 +@@ -146,7 +146,6 @@ + (u->scheme ? u->scheme : "")); + /*@=usereleased@*/ } +- xx = davFree(u); u->buf = _free(u->buf); -@@ -352,9 +351,6 @@ + u->url = _free(u->url); + u->scheme = _free((void *)u->scheme); +@@ -348,9 +347,6 @@ } urlstrings[] = { { "file://", URL_IS_PATH }, { "ftp://", URL_IS_FTP },