RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Oct-2014 14:56:41
Branch: rpm-5_4 Handle: 2014101112563803
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmdav.c rpmhkp.c rpmpython.c
Log:
- integrate some PLD patches.
Summary:
Revision Changes Path
2.119.2.17 +23 -1 rpm/rpmio/rpmdav.c
2.20.2.9 +9 -1 rpm/rpmio/rpmhkp.c
2.16.2.8 +2 -0 rpm/rpmio/rpmpython.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.119.2.16 -r2.119.2.17 rpmdav.c
--- rpm/rpmio/rpmdav.c 30 Sep 2014 22:31:43 -0000 2.119.2.16
+++ rpm/rpmio/rpmdav.c 11 Oct 2014 12:56:38 -0000 2.119.2.17
@@ -1278,8 +1278,29 @@
/* HACK: ne_request_dispatch ALTERNATIVE to ne_{begin,end}_request */
rc = davCheck(v->ctrl->req, "ne_request_dispatch",
ne_request_dispatch(v->ctrl->req));
- status = ne_get_status(v->ctrl->req);
+ status = ne_get_status((ne_request *)v->ctrl->req);
+
+#if defined(RPM_VENDOR_PLD)
+/* XXX
https://github.com/pld-linux/rpm/blob/master/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
*/
+ if (_dav_debug)
+ fprintf(stderr, "HTTP request sent, awaiting response... %d %s\n",
status->code, status->reason_phrase);
+
+ switch (status->code) {
+ case 200:
+ case 201: /* 201 Created. */
+ break;
+ case 204: /* HACK: if overwriting, 204 No
Content. */
+ case 403: /* 403 Forbidden. */
+ rc = FTPERR_UNKNOWN;
+ break;
+ default:
+ rc = FTPERR_FILE_NOT_FOUND;
+ break;
+ }
+ if (rc || _dav_debug)
+ fprintf(stderr, "HTTP request sent, awaiting response... %d %s\n",
status->code, status->reason_phrase);
+#else /* RPM_VENDOR_PLD */
/* XXX somewhere else instead? */
DAVDEBUG(1, (stderr, "HTTP request sent, awaiting response... %d %s\n",
status->code, status->reason_phrase));
@@ -1305,6 +1326,7 @@
goto exit;
break;
}
+#endif /* RPM_VENDOR_PLD */
#if defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmhkp.c
============================================================================
$ cvs diff -u -r2.20.2.8 -r2.20.2.9 rpmhkp.c
--- rpm/rpmio/rpmhkp.c 24 Sep 2014 13:03:03 -0000 2.20.2.8
+++ rpm/rpmio/rpmhkp.c 11 Oct 2014 12:56:41 -0000 2.20.2.9
@@ -916,6 +916,14 @@
HKPDEBUG((stderr, "--> %s(%p,%s)\n", __FUNCTION__, hkp, keyname));
+ /* Reset temporary variables*/
+ hkp->pubx = -1;
+ hkp->uidx = -1;
+ hkp->subx = -1;
+ hkp->sigx = -1;
+ hkp->tvalid = 0;
+ hkp->uvalidx = -1;
+
/* Do a lazy lookup before validating. */
if (hkp == NULL && keyname && *keyname) {
if ((hkp = rpmhkpLookup(keyname)) == NULL) {
@@ -1079,7 +1087,7 @@
}
exit:
- if ((hkp->uidx >= 0 && hkp->uidx < hkp->npkts) && hkp->tvalid > 0) {
+ if ((hkp->uvalidx >= 0 && hkp->uvalidx < hkp->npkts) && hkp->tvalid > 0)
{
char user[256+1];
size_t nuser;
pgpPktUid * u;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
============================================================================
$ cvs diff -u -r2.16.2.7 -r2.16.2.8 rpmpython.c
--- rpm/rpmio/rpmpython.c 6 Aug 2014 20:40:37 -0000 2.16.2.7
+++ rpm/rpmio/rpmpython.c 11 Oct 2014 12:56:41 -0000 2.16.2.8
@@ -181,6 +181,8 @@
if (sys_stdout != NULL && PycStringIO_OutputCheck(sys_stdout)) {
PyObject * o = (*PycStringIO->cgetvalue)(sys_stdout);
*resultp = (PyString_Check(o) ? PyString_AsString(o) : "");
+ PyObject_CallMethod(sys_stdout, "seek", "i",0);
+ PyObject_CallMethod(sys_stdout, "truncate", NULL);
} else
*resultp = "";
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
