Author: glen Date: Thu Sep 4 15:00:05 2008 GMT
Module: SOURCES Tag: rpm-4_5
---- Log message:
- kill bad parts, start it from scratch
---- Files affected:
SOURCES:
rpm-no-neon.patch (1.11.4.2 -> 1.11.4.3)
---- Diffs:
================================================================
Index: SOURCES/rpm-no-neon.patch
diff -u SOURCES/rpm-no-neon.patch:1.11.4.2 SOURCES/rpm-no-neon.patch:1.11.4.3
--- SOURCES/rpm-no-neon.patch:1.11.4.2 Thu Sep 4 16:50:47 2008
+++ SOURCES/rpm-no-neon.patch Thu Sep 4 17:00:00 2008
@@ -1858,728 +1858,65 @@
#ifdef __cplusplus
}
#endif
---- 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);
- /[EMAIL PROTECTED]@*/
-- /* HACK: flimsy wiring for davRead */
-- if (fd->req != NULL) {
-- rc = davRead(fd, buf, (count > fd->bytesRemain ? fd->bytesRemain :
count));
-- /* XXX Chunked davRead EOF. */
-- if (rc == 0)
-- fd->bytesRemain = 0;
-- } else
- rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain
: count));
- /[EMAIL PROTECTED]@*/
- fdstat_exit(fd, FDSTAT_READ, rc);
-@@ -440,10 +433,6 @@
-
- fdstat_enter(fd, FDSTAT_WRITE);
- /[EMAIL PROTECTED]@*/
-- /* HACK: flimsy wiring for davWrite */
-- if (fd->req != NULL)
-- rc = davWrite(fd, buf, (count > fd->bytesRemain ? fd->bytesRemain :
count));
-- else
- rc = write(fdno, buf, (count > fd->bytesRemain ? fd->bytesRemain :
count));
- /[EMAIL PROTECTED]@*/
- fdstat_exit(fd, FDSTAT_WRITE, rc);
-@@ -490,11 +479,6 @@
- fdSetFdno(fd, -1);
-
- fdstat_enter(fd, FDSTAT_CLOSE);
-- /* HACK: flimsy wiring for davClose */
--/[EMAIL PROTECTED]@*/
-- if (fd->req != NULL)
-- rc = davClose(fd);
-- else
- rc = ((fdno >= 0) ? close(fdno) : -2);
- /[EMAIL PROTECTED]@*/
- fdstat_exit(fd, FDSTAT_CLOSE, rc);
-@@ -547,10 +531,6 @@
- FD_ZERO(&wrfds);
- #endif
-
-- /* HACK: flimsy wiring for davWrite */
-- if (fd->req != NULL)
-- return 1;
--
- if ((fdno = fdFileno(fd)) < 0)
- return -1; /* XXX W2DO? */
-
-@@ -602,10 +582,6 @@
- FD_ZERO(&rdfds);
- #endif
-
-- /* HACK: flimsy wiring for davRead */
-- if (fd->req != NULL)
-- return 1;
--
- if ((fdno = fdFileno(fd)) < 0)
- return -1; /* XXX W2DO? */
-
-@@ -1758,159 +1734,6 @@
- return rc;
- }
-
--#ifdef DEAD
--static int httpResp(urlinfo u, FD_t ctrl, /[EMAIL PROTECTED]@*/ char ** str)
-- /[EMAIL PROTECTED] fileSystem @*/
-- /[EMAIL PROTECTED] ctrl, *str, fileSystem @*/
--{
-- int ec = 0;
-- int rc;
--
-- URLSANE(u);
-- rc = checkResponse(u, ctrl, &ec, str);
--
--if (_ftp_debug && !(rc == 0 && (ec == 200 || ec == 201)))
--fprintf(stderr, "*** httpResp: rc %d ec %d\n", rc, ec);
--
-- switch (ec) {
-- case 200:
-- case 201: /* 201 Created. */
-- break;
-- case 204: /* HACK: if overwriting, 204 No Content. */
-- case 403: /* 403 Forbidden. */
-- ctrl->syserrno = EACCES; /* HACK */
-- rc = FTPERR_UNKNOWN;
-- break;
-- default:
-- rc = FTPERR_FILE_NOT_FOUND;
-- break;
-- }
-- return rc;
--}
--
--static int httpReq(FD_t ctrl, const char * httpCmd, const char * httpArg)
-- /[EMAIL PROTECTED] h_errno, fileSystem, internalState @*/
-- /[EMAIL PROTECTED] ctrl, fileSystem, internalState @*/
--{
-- urlinfo u;
-- const char * host;
-- const char * path;
-- char hthost[NI_MAXHOST];
-- int port;
-- int rc;
-- char * req;
-- size_t len;
-- int retrying = 0;
--
--assert(ctrl != NULL);
-- u = ctrl->url;
-- URLSANE(u);
--
-- 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;
-- /[EMAIL PROTECTED]@*/
-- if (path == NULL) path = "";
-- /[EMAIL PROTECTED]@*/
--
--reopen:
-- /[EMAIL PROTECTED]@*/
-- if (fdFileno(ctrl) >= 0 && (rc = fdWritable(ctrl, 0)) < 1) {
-- /[EMAIL PROTECTED]@*/ (void) fdClose(ctrl); /[EMAIL PROTECTED]@*/
-- }
-- /[EMAIL PROTECTED]@*/
--
--/[EMAIL PROTECTED]@*/
-- if (fdFileno(ctrl) < 0) {
-- rc = tcpConnect(ctrl, host, port);
-- if (rc < 0)
-- goto errxit2;
-- ctrl = fdLink(ctrl, "open ctrl (httpReq)");
-- }
--
-- len = sizeof("\
--req x HTTP/1.0\r\n\
--User-Agent: rpm/3.0.4\r\n\
--Host: y:z\r\n\
--Accept: text/plain\r\n\
--Transfer-Encoding: chunked\r\n\
--\r\n\
--") + strlen(httpCmd) + strlen(path) + sizeof(VERSION) + strlen(hthost) + 20;
--
--/[EMAIL PROTECTED]@*/
-- req = alloca(len);
-- *req = '\0';
--
-- if (!strcmp(httpCmd, "PUT")) {
-- sprintf(req, "\
--%s %s HTTP/1.%d\r\n\
--User-Agent: rpm/%s\r\n\
--Host: %s:%d\r\n\
--Accept: text/plain\r\n\
--Transfer-Encoding: chunked\r\n\
--\r\n\
--", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port);
--} else {
-- sprintf(req, "\
--%s %s HTTP/1.%d\r\n\
--User-Agent: rpm/%s\r\n\
--Host: %s:%d\r\n\
--Accept: text/plain\r\n\
--\r\n\
--", httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port);
--}
--/[EMAIL PROTECTED]@*/
--
--if (_ftp_debug)
--fprintf(stderr, "-> %s", req);
--
-- len = strlen(req);
-- if (fdWrite(ctrl, req, len) != len) {
-- rc = FTPERR_SERVER_IO_ERROR;
-- goto errxit;
-- }
--
-- /[EMAIL PROTECTED]@*/
-- if (!strcmp(httpCmd, "PUT")) {
-- ctrl->wr_chunked = 1;
-- } else {
--
-- rc = httpResp(u, ctrl, NULL);
--
-- if (rc) {
-- if (!retrying) { /* not HTTP_OK */
-- retrying = 1;
-- /[EMAIL PROTECTED]@*/ (void) fdClose(ctrl); /[EMAIL
PROTECTED]@*/
-- goto reopen;
-- }
-- goto errxit;
-- }
-- }
-- /[EMAIL PROTECTED]@*/
--
-- ctrl = fdLink(ctrl, "open data (httpReq)");
-- return 0;
+--- rpm-4.5/rpmio/rpmio.c~ 2008-09-04 17:45:06.000000000 +0300
++++ rpm-4.5/rpmio/rpmio.c 2008-09-04 17:47:14.122344271 +0300
+@@ -155,11 +155,6 @@
+ /[EMAIL PROTECTED]@*/
+ int _ftp_debug = 0;
+
+-/**
+- */
+-/[EMAIL PROTECTED]@*/
+-int _dav_debug = 0;
-
--errxit:
-- /[EMAIL PROTECTED]@*/
-- fdSetSyserrno(ctrl, errno, ftpStrerror(rc));
-- /[EMAIL PROTECTED]@*/
--errxit2:
-- /[EMAIL PROTECTED]@*/
-- if (fdFileno(ctrl) >= 0)
-- /[EMAIL PROTECTED]@*/ (void) fdClose(ctrl); /[EMAIL PROTECTED]@*/
-- /[EMAIL PROTECTED]@*/
-- return rc;
--/[EMAIL PROTECTED]@*/
--}
--#endif
--
- /* XXX DYING: unused */
- void * ufdGetUrlinfo(FD_t fd)
- {
-@@ -2268,29 +2091,6 @@
- fd->wr_chunked = 0;
- }
- break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- case URL_IS_HKP:
-- fd = davOpen(url, flags, mode, &u);
-- if (fd == NULL || u == NULL)
-- break;
--
-- cmd = ((flags & O_WRONLY)
-- ? ((flags & O_APPEND) ? "PUT" :
-- ((flags & O_CREAT) ? "PUT" : "PUT"))
-- : "GET");
-- u->openError = davReq(fd, cmd, path);
-- if (u->openError < 0) {
-- /* XXX make sure that we can exit through ufdClose */
-- fd = fdLink(fd, "error ctrl (ufdOpen HTTP)");
-- fd = fdLink(fd, "error data (ufdOpen HTTP)");
-- } else {
-- fd->bytesRemain = ((!strcmp(cmd, "GET"))
-- ? fd->contentLength : -1);
-- fd->wr_chunked = ((!strcmp(cmd, "PUT"))
-- ? fd->wr_chunked : 0);
-- }
-- break;
- case URL_IS_DASH:
- assert(!(flags & O_RDWR));
- fd = fdDup( ((flags & O_WRONLY) ? STDOUT_FILENO : STDIN_FILENO) );
-@@ -2908,10 +2708,8 @@
- if (fd->nfps > 0 && fpno == -1 &&
- fd->fps[fd->nfps-1].io == ufdio &&
- fd->fps[fd->nfps-1].fp == fp &&
-- (fd->fps[fd->nfps-1].fdno >= 0 || fd->req != NULL))
-+ (fd->fps[fd->nfps-1].fdno >= 0))
- {
-- int hadreqpersist = (fd->req != NULL);
--
- if (fp)
- rc = fflush(fp);
- fd->nfps--;
-@@ -2921,26 +2719,9 @@
- /[EMAIL PROTECTED]@*/
- if (fdGetFdno(fd) >= 0)
- break;
-- if (!fd->persist)
-- hadreqpersist = 0;
- fdSetFp(fd, NULL);
- fd->nfps++;
- if (fp) {
-- /* HACK: flimsy Keepalive wiring. */
-- if (hadreqpersist) {
-- fd->nfps--;
--/[EMAIL PROTECTED]@*/
-- fdSetFp(fd, fp);
--/[EMAIL PROTECTED]@*/
--/[EMAIL PROTECTED]@*/
-- (void) fdClose(fd);
--/[EMAIL PROTECTED]@*/
-- fdSetFp(fd, NULL);
-- fd->nfps++;
--/[EMAIL PROTECTED]@*/
-- (void) fdClose(fd);
--/[EMAIL PROTECTED]@*/
-- } else
- rc = fclose(fp);
- }
- fdPop(fd);
-@@ -3195,18 +2976,9 @@
- return NULL;
- }
- } else {
-- FILE *fp;
-- int fdno;
-- int isHTTP = 0;
--
- /* XXX gzdio and bzdio here too */
-
- switch (urlIsURL(path)) {
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- case URL_IS_HKP:
-- isHTTP = 1;
-- /[EMAIL PROTECTED]@*/
- case URL_IS_PATH:
- case URL_IS_DASH:
- case URL_IS_FTP:
-@@ -3214,7 +2986,7 @@
- if (_rpmio_debug)
- fprintf(stderr, "*** Fopen ufdio path %s fmode %s\n", path, fmode);
- fd = ufdOpen(path, flags, perms);
-- if (fd == NULL || !(fdFileno(fd) >= 0 || fd->req != NULL))
-+ if (fd == NULL || !(fdFileno(fd) >= 0))
- return fd;
- break;
- default:
-@@ -3223,15 +2995,6 @@
- return NULL;
- /[EMAIL PROTECTED]@*/ break;
- }
--
-- /* XXX persistent HTTP/1.1 returns the previously opened fp */
-- if (isHTTP && ((fp = fdGetFp(fd)) != NULL) && ((fdno = fdGetFdno(fd))
>= 0 || fd->req != NULL))
-- {
-- /[EMAIL PROTECTED]@*/
-- fdPush(fd, fpio, fp, fileno(fp)); /* Push fpio onto stack */
-- /[EMAIL PROTECTED]@*/
-- return fd;
-- }
- }
- /[EMAIL PROTECTED]@*/
-
-@@ -3267,10 +3030,6 @@
- int i, rc = 0;
-
- if (fd == NULL) return -1;
-- if (fd->req != NULL) {
-- /* HACK: flimsy wiring for neon errors. */
-- rc = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
-- } else
- for (i = fd->nfps; rc == 0 && i >= 0; i--) {
- /[EMAIL PROTECTED]@*/
- FDSTACK_t * fps = &fd->fps[i];
-@@ -3305,9 +3064,6 @@
- {
- int i, rc = -1;
-
-- if (fd->req != NULL)
-- rc = 123456789; /* HACK: https has no steenkin fileno. */
-- else
- for (i = fd->nfps ; rc == -1 && i >= 0; i--) {
- /[EMAIL PROTECTED]@*/
- rc = fd->fps[i].fdno;
-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 @@
- /[EMAIL PROTECTED]@*/
- void * url; /* ufdio: URL info */
- /[EMAIL PROTECTED]@*/
-- void * req; /* ufdio: HTTP request */
-
- int rd_timeoutsecs; /* ufdRead: per FD_t timer */
- ssize_t bytesRemain; /* ufdio: */
-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);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davMkdir(path, mode);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -118,15 +114,6 @@
- case URL_IS_FTP:
- return ftpChdir(path);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
--#ifdef NOTYET
-- return davChdir(path);
--#else
-- errno = EINVAL; /* XXX W2DO? */
-- return -2;
--#endif
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -151,10 +138,6 @@
- case URL_IS_FTP:
- return ftpRmdir(path);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davRmdir(path);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -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) {
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davRename(oldpath, newpath);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_FTP: /* XXX WRONG WRONG WRONG */
- case URL_IS_PATH:
- case URL_IS_UNKNOWN:
-@@ -233,8 +210,6 @@
- return -2;
- return ftpRename(oldpath, newpath);
- /[EMAIL PROTECTED]@*/ 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);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davUnlink(path);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -1308,10 +1275,6 @@
- case URL_IS_FTP:
- return ftpStat(path, st);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davStat(path, st);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -1338,10 +1301,6 @@
- case URL_IS_FTP:
- return ftpLstat(path, st);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
-- return davLstat(path, st);
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -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);
- /[EMAIL PROTECTED]@*/ break;
-- case URL_IS_HTTPS:
-- case URL_IS_HTTP:
--#ifdef NOTYET
-- return davReadlink(path, buf, bufsiz);
--#else
-- return -2;
--#endif
-- /[EMAIL PROTECTED]@*/ break;
- case URL_IS_PATH:
- path = lpath;
- /[EMAIL PROTECTED]@*/
-@@ -1617,8 +1552,6 @@
- break;
- case URL_IS_DASH:
- case URL_IS_HKP:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-no-neon.patch?r1=1.11.4.2&r2=1.11.4.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
