RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   04-Dec-2007 23:53:55
  Branch: HEAD                             Handle: 2007120422535400

  Modified files:
    rpm                     CHANGES TODO
    rpm/python              header-py.c header-py.h rpmmodule.c

  Log:
    - make sure that yum can upgrade zlib-devel. Trash the DEAD code.

  Summary:
    Revision    Changes     Path
    1.1937      +1  -0      rpm/CHANGES
    1.35        +0  -2      rpm/TODO
    1.89        +0  -101    rpm/python/header-py.c
    1.15        +0  -12     rpm/python/header-py.h
    1.161       +1  -4      rpm/python/rpmmodule.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1936 -r1.1937 CHANGES
  --- rpm/CHANGES	4 Dec 2007 22:41:53 -0000	1.1936
  +++ rpm/CHANGES	4 Dec 2007 22:53:54 -0000	1.1937
  @@ -1,4 +1,5 @@
   5.0a4 -> 5.0b1:
  +    - jbj: make sure that yum can upgrade zlib-devel. Trash the DEAD code.
       - jbj: resurrect rpmMergeHeadersFromFD goop. Yah, mon, DEAD code ...
       - jbj: re-add symbols needed for rpm-python import to loader map.
       - jbj: stub in WITH_NSS define to try rpmnss. Yep, borked, but now tested.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/TODO
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 TODO
  --- rpm/TODO	4 Dec 2007 21:53:42 -0000	1.34
  +++ rpm/TODO	4 Dec 2007 22:53:54 -0000	1.35
  @@ -85,8 +85,6 @@
   +  Pkgid:     !!binary pM5VJBrMT40gEk4TSvNrdA==
   +  Hdrid: 72a11d90029ae1fbd61cd3741f4bb25681d8546d
   	(other contents are now identical after fixing RPMTAG_BUILDTIME).
  -    - jbj: rpmMergeHeadersFromFD has gone AWOL and is needed by yum
  -	/usr/lib/python2.5/site-packages/rpm/_rpmmodule.so: undefined symbol: rpmMergeHeadersFromFD
       - jbj: retrieved headers are occaisionally failing sanity checks.
       - jbj: VSFlags (and --nodigest/--nosignature) is now per-verify rather than
   	persistently per-transaction scoped because of moving the flags into
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.c
  ============================================================================
  $ cvs diff -u -r1.88 -r1.89 header-py.c
  --- rpm/python/header-py.c	4 Dec 2007 22:41:53 -0000	1.88
  +++ rpm/python/header-py.c	4 Dec 2007 22:53:54 -0000	1.89
  @@ -756,107 +756,6 @@
       return list;
   }
   
  -#if defined(DEAD)
  -/**
  - * This assumes the order of list matches the order of the new headers, and
  - * throws an exception if that isn't true.
  - */
  -int rpmMergeHeaders(PyObject * list, FD_t fd, rpmTag matchTag)
  -{
  -    HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
  -    Header h;
  -    HeaderIterator hi;
  -    rpmTagData newMatch;
  -    rpmTagData oldMatch;
  -    hdrObject * hdr;
  -    rpmTagCount count = 0;
  -    const char item[] = "Header";
  -    rpmRC rc;
  -    int xx;
  -
  -    Py_BEGIN_ALLOW_THREADS
  -    h = NULL;
  -    rc = rpmpkgRead(item, fd, &h, NULL);
  -    Py_END_ALLOW_THREADS
  -
  -    while (h) {
  -	he->tag = matchTag;
  -	xx = headerGet(h, he, 0);
  -	newMatch.ui32p = he->p.ui32p;
  -	if (!xx) {
  -	    PyErr_SetString(pyrpmError, "match tag missing in new header");
  -	    return 1;
  -	}
  -
  -	hdr = (hdrObject *) PyList_GetItem(list, count++);
  -	if (!hdr) return 1;
  -
  -	he->tag = matchTag;
  -	xx = headerGet(h, he, 0);
  -	oldMatch.ui32p = he->p.ui32p;
  -	if (!xx) {
  -	    PyErr_SetString(pyrpmError, "match tag missing in new header");
  -	    return 1;
  -	}
  -
  -	if (*newMatch.ui32p != *oldMatch.ui32p) {
  -	    PyErr_SetString(pyrpmError, "match tag mismatch");
  -	    return 1;
  -	}
  -
  -	for (hi = headerInit(h);
  -	    headerNext(hi, he, 0);
  -	    he->p.ptr = _free(he->p.ptr))
  -	{
  -	    /* could be dupes */
  -	    headerDel(hdr->h, he, 0);
  -	    headerPut(hdr->h, he, 0);
  -	}
  -	hi = headerFini(hi);
  -	h = headerFree(h);
  -
  -	Py_BEGIN_ALLOW_THREADS
  -	h = NULL;
  -	rc = rpmpkgRead(item, fd, &h, NULL);
  -	Py_END_ALLOW_THREADS
  -    }
  -
  -    return 0;
  -}
  -
  -PyObject *
  -rpmMergeHeadersFromFD(PyObject * self, PyObject * args, PyObject * kwds)
  -{
  -    FD_t fd;
  -    int fileno;
  -    PyObject * list;
  -    int rc;
  -    rpmTag matchTag;
  -    char * kwlist[] = {"list", "fd", "matchTag", NULL};
  -
  -    if (!PyArg_ParseTupleAndKeywords(args, kwds, "Oii", kwlist, &list,
  -	    &fileno, &matchTag))
  -	return NULL;
  -
  -    if (!PyList_Check(list)) {
  -	PyErr_SetString(PyExc_TypeError, "first parameter must be a list");
  -	return NULL;
  -    }
  -
  -    fd = fdDup(fileno);
  -
  -    rc = rpmMergeHeaders (list, fd, matchTag);
  -    Fclose(fd);
  -
  -    if (rc) {
  -	return NULL;
  -    }
  -
  -    Py_INCREF(Py_None);
  -    return Py_None;
  -}
  -#endif	/* DEAD */
  -
   /**
    */
   PyObject *
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.h
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 header-py.h
  --- rpm/python/header-py.h	4 Dec 2007 22:41:53 -0000	1.14
  +++ rpm/python/header-py.h	4 Dec 2007 22:53:54 -0000	1.15
  @@ -50,18 +50,6 @@
   PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds)
   	/*@*/;
   
  -#if defined(DEAD)
  -/** \ingroup py_c
  - */
  -int rpmMergeHeaders(PyObject * list, FD_t fd, rpmTag matchTag)
  -	/*@*/;
  -
  -/** \ingroup py_c
  - */
  -PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args, PyObject * kwds)
  -	/*@*/;
  -#endif	/* DEAD */
  -
   /** \ingroup py_c
    */
   PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args, PyObject * kwds)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmmodule.c
  ============================================================================
  $ cvs diff -u -r1.160 -r1.161 rpmmodule.c
  --- rpm/python/rpmmodule.c	4 Dec 2007 22:41:53 -0000	1.160
  +++ rpm/python/rpmmodule.c	4 Dec 2007 22:53:54 -0000	1.161
  @@ -186,10 +186,7 @@
   
       { "headerLoad", (PyCFunction) hdrLoad, METH_VARARGS|METH_KEYWORDS,
   	NULL },
  -#if defined(DEAD)
  -    { "mergeHeaderListFromFD", (PyCFunction) rpmMergeHeadersFromFD, METH_VARARGS|METH_KEYWORDS,
  -	NULL },
  -#endif
  +
       { "readHeaderListFromFD", (PyCFunction) rpmHeaderFromFD, METH_VARARGS|METH_KEYWORDS,
   	NULL },
       { "readHeaderListFromFile", (PyCFunction) rpmHeaderFromFile, METH_VARARGS|METH_KEYWORDS,
  @@ .