rpms/rpm/F-11 rpm-4.7.0-python-altnevr.patch, NONE, 1.1 rpm.spec, 1.348, 1.349

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23488

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-python-altnevr.patch 
Log Message:
- don't mess up problem altNEVR in python ts.check() (#501068)


rpm-4.7.0-python-altnevr.patch:

--- NEW FILE rpm-4.7.0-python-altnevr.patch ---
commit 9322f737819a3d81088699b1d7fa667259245411
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue May 19 10:26:50 2009 +0300

    Don't mess up problem altNEVR in python ts.check() (rhbz#501068)
    - the use of strrchr() silently casts away the const from the problem
      set altNEVR string, which we then happily modify..
    - similar to commit 62cc76e25cdfad78ac30bb28f626b474efdecddc

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index e56e001..9877fbc 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -365,7 +365,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
 
 	/* XXX TODO: rpmlib >= 4.0.3 can return multiple suggested keys. */
 	while ((i = rpmpsNextIterator(psi)) >= 0) {
-	    const char * needsName;
+	    char * altNEVR, * needsName;
 	    char * byName, * byVersion, * byRelease, *byArch;
 	    char * needsOP, * needsVersion;
 	    rpmsenseFlags needsFlags, sense;
@@ -383,7 +383,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
 
 	    key = rpmProblemGetKey(p);
 
-	    needsName = rpmProblemGetAltNEVR(p);
+	    altNEVR = needsName = xstrdup(rpmProblemGetAltNEVR(p));
 	    if (needsName[1] == ' ') {
 		sense = (needsName[0] == 'C')
 			? RPMDEP_SENSE_CONFLICTS : RPMDEP_SENSE_REQUIRES;
@@ -409,6 +409,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
 	    PyList_Append(list, (PyObject *) cf);
 	    Py_DECREF(cf);
 	    free(byName);
+	    free(altNEVR);
 	}
 
 	psi = rpmpsFreeIterator(psi);


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- rpm.spec	18 Jun 2009 15:50:15 -0000	1.348
+++ rpm.spec	18 Jun 2009 15:52:23 -0000	1.349
@@ -45,6 +45,7 @@ Patch3: rpm-4.6.0-fedora-specspo.patch
 # Patches already in upstream
 Patch200: rpm-4.7.0-findlang-kde3.patch
 Patch201: rpm-4.7.0-prtsig.patch
+Patch202: rpm-4.7.0-python-altnevr.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -188,6 +189,7 @@ that will manipulate RPM packages and da
 
 %patch200 -p1 -b .findlang-kde3
 %patch201 -p1 -b .prtsig
+%patch202 -p1 -b .py-altnevr
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
@@ -404,6 +406,7 @@ exit 0
   - consistently classify all text as such and include description
 - fix find-lang --with-kde with KDE3 (#466009)
 - fix pgp pubkey signature tag parsing
+- don't mess up problem altNEVR in python ts.check() (#501068)
 
 * Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
 - update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)