[CVS] RPM: rpm/popt/ autogen.sh config.rpath configure.ac rpm/popt/int...

2007-06-05 Thread Arkadiusz Miskiewicz
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   05-Jun-2007 21:44:30
  Branch: HEAD Handle: 2007060520442801

  Modified files:
rpm/poptautogen.sh configure.ac
rpm/popt/po .cvsignore
  Removed files:
rpm/poptconfig.rpath mkinstalldirs
rpm/popt/intl   Makefile.in
rpm/popt/po ChangeLog Makefile.in.in Rules-quot boldquot.sed
[EMAIL PROTECTED] [EMAIL PROTECTED]
insert-header.sin quot.sed remove-potcdate.sed
remove-potcdate.sin

  Log:
Drop autogenerated or autocopied files. Run gettextize which copies
needed files.

  Summary:
RevisionChanges Path
1.11+1  -0  rpm/popt/autogen.sh
1.3 +0  -614rpm/popt/config.rpath
1.11+1  -1  rpm/popt/configure.ac
1.6 +0  -562rpm/popt/intl/Makefile.in
1.3 +0  -40 rpm/popt/mkinstalldirs
1.6 +5  -0  rpm/popt/po/.cvsignore
1.3 +0  -12 rpm/popt/po/ChangeLog
1.17+0  -403rpm/popt/po/Makefile.in.in
1.3 +0  -47 rpm/popt/po/Rules-quot
1.3 +0  -10 rpm/popt/po/boldquot.sed
1.3 +0  -25 rpm/popt/po/[EMAIL PROTECTED]
1.3 +0  -22 rpm/popt/po/[EMAIL PROTECTED]
1.3 +0  -23 rpm/popt/po/insert-header.sin
1.3 +0  -6  rpm/popt/po/quot.sed
1.2 +0  -11 rpm/popt/po/remove-potcdate.sed
1.3 +0  -19 rpm/popt/po/remove-potcdate.sin
  

  patch -p0 '@@ .'
  Index: rpm/popt/autogen.sh
  
  $ cvs diff -u -r1.10 -r1.11 autogen.sh
  --- rpm/popt/autogen.sh   17 Jan 2005 22:12:08 -  1.10
  +++ rpm/popt/autogen.sh   5 Jun 2007 19:44:28 -   1.11
  @@ -16,6 +16,7 @@
   esac
   
   cd $srcdir
  +gettextize --copy --force --intl
   $libtoolize --copy --force
   aclocal
   autoheader
  @@ .
  rm -f rpm/popt/config.rpath '@@ .'
  Index: rpm/popt/config.rpath
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 '@@ .'
  Index: rpm/popt/configure.ac
  
  $ cvs diff -u -r1.10 -r1.11 configure.ac
  --- rpm/popt/configure.ac 25 May 2007 17:36:23 -  1.10
  +++ rpm/popt/configure.ac 5 Jun 2007 19:44:28 -   1.11
  @@ -110,4 +110,4 @@
[Full path to popt top_srcdir.])
   AC_SUBST(POPT_SOURCE_PATH)
   
  -AC_OUTPUT([Doxyfile Makefile po/Makefile.in intl/Makefile])
  +AC_OUTPUT([Doxyfile Makefile])
  @@ .
  rm -f rpm/popt/intl/Makefile.in '@@ .'
  Index: rpm/popt/intl/Makefile.in
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/mkinstalldirs '@@ .'
  Index: rpm/popt/mkinstalldirs
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 '@@ .'
  Index: rpm/popt/po/.cvsignore
  
  $ cvs diff -u -r1.5 -r1.6 .cvsignore
  --- rpm/popt/po/.cvsignore30 May 2007 02:45:47 -  1.5
  +++ rpm/popt/po/.cvsignore5 Jun 2007 19:44:28 -   1.6
  @@ -1,8 +1,13 @@
   Makefile
   Makefile.in
  +Makefile.in.in
  +Makevars.template
   POTFILES
   stamp-cat-id
   stamp-po
   cat-id-tbl.c
  +*.header
   *.mo
   *.gmo
  +*.sed
  +*.sin
  @@ .
  rm -f rpm/popt/po/ChangeLog '@@ .'
  Index: rpm/popt/po/ChangeLog
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/Makefile.in.in '@@ .'
  Index: rpm/popt/po/Makefile.in.in
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/Rules-quot '@@ .'
  Index: rpm/popt/po/Rules-quot
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/boldquot.sed '@@ .'
  Index: rpm/popt/po/boldquot.sed
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f 

[CVS] RPM: rpm-4_5: rpm/popt/ autogen.sh config.rpath configure.ac rpm...

2007-06-05 Thread Arkadiusz Miskiewicz
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   05-Jun-2007 21:58:53
  Branch: rpm-4_5  Handle: 2006120818032415472528

  Modified files:   (Branch: rpm-4_5)
rpm/poptautogen.sh configure.ac
rpm/popt/po .cvsignore
  Removed files:(Branch: rpm-4_5)
rpm/poptconfig.rpath mkinstalldirs
rpm/popt/intl   Makefile.in
rpm/popt/m4 ChangeLog codeset.m4 gettext.m4 glibc2.m4
glibc21.m4 iconv.m4 intdiv0.m4 intl.m4 intldir.m4
intmax.m4 inttypes-pri.m4 inttypes_h.m4
lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4
lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4
printf-posix.m4 progtest.m4 size_max.m4
stdint_h.m4 uintmax_t.m4 ulonglong.m4
visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4
rpm/popt/po ChangeLog Makefile.in.in Rules-quot boldquot.sed
[EMAIL PROTECTED] [EMAIL PROTECTED]
insert-header.sin quot.sed remove-potcdate.sin

  Log:
Drop autogenerated or autocopied files. Run gettextize which copies
needed files.

  Summary:
RevisionChanges Path
1.10.4.1+1  -0  rpm/popt/autogen.sh
1.3 +0  -614rpm/popt/config.rpath
1.10.2.2+1  -1  rpm/popt/configure.ac
1.6 +0  -562rpm/popt/intl/Makefile.in
1.1 +0  -36 rpm/popt/m4/ChangeLog
1.1 +0  -21 rpm/popt/m4/codeset.m4
1.1 +0  -417rpm/popt/m4/gettext.m4
1.1 +0  -30 rpm/popt/m4/glibc2.m4
1.1 +0  -30 rpm/popt/m4/glibc21.m4
1.1 +0  -101rpm/popt/m4/iconv.m4
1.1 +0  -70 rpm/popt/m4/intdiv0.m4
1.1 +0  -259rpm/popt/m4/intl.m4
1.1 +0  -19 rpm/popt/m4/intldir.m4
1.1 +0  -33 rpm/popt/m4/intmax.m4
1.1 +0  -36 rpm/popt/m4/inttypes-pri.m4
1.1 +0  -26 rpm/popt/m4/inttypes_h.m4
1.1 +0  -30 rpm/popt/m4/lcmessage.m4
1.1 +0  -110rpm/popt/m4/lib-ld.m4
1.1 +0  -644rpm/popt/m4/lib-link.m4
1.1 +0  -185rpm/popt/m4/lib-prefix.m4
1.1 +0  -311rpm/popt/m4/lock.m4
1.1 +0  -31 rpm/popt/m4/longdouble.m4
1.1 +0  -48 rpm/popt/m4/longlong.m4
1.1 +0  -31 rpm/popt/m4/nls.m4
1.1 +0  -428rpm/popt/m4/po.m4
1.1 +0  -44 rpm/popt/m4/printf-posix.m4
1.1 +0  -92 rpm/popt/m4/progtest.m4
1.1 +0  -62 rpm/popt/m4/size_max.m4
1.1 +0  -26 rpm/popt/m4/stdint_h.m4
1.1 +0  -30 rpm/popt/m4/uintmax_t.m4
1.1 +0  -48 rpm/popt/m4/ulonglong.m4
1.1 +0  -52 rpm/popt/m4/visibility.m4
1.1 +0  -20 rpm/popt/m4/wchar_t.m4
1.1 +0  -20 rpm/popt/m4/wint_t.m4
1.1 +0  -13 rpm/popt/m4/xsize.m4
1.3 +0  -40 rpm/popt/mkinstalldirs
1.4.14.2+5  -0  rpm/popt/po/.cvsignore
1.3 +0  -12 rpm/popt/po/ChangeLog
1.17+0  -403rpm/popt/po/Makefile.in.in
1.3 +0  -47 rpm/popt/po/Rules-quot
1.3 +0  -10 rpm/popt/po/boldquot.sed
1.3 +0  -25 rpm/popt/po/[EMAIL PROTECTED]
1.3 +0  -22 rpm/popt/po/[EMAIL PROTECTED]
1.3 +0  -23 rpm/popt/po/insert-header.sin
1.3 +0  -6  rpm/popt/po/quot.sed
1.3 +0  -19 rpm/popt/po/remove-potcdate.sin
  

  patch -p0 '@@ .'
  Index: rpm/popt/autogen.sh
  
  $ cvs diff -u -r1.10 -r1.10.4.1 autogen.sh
  --- rpm/popt/autogen.sh   17 Jan 2005 22:12:08 -  1.10
  +++ rpm/popt/autogen.sh   5 Jun 2007 19:58:48 -   1.10.4.1
  @@ -16,6 +16,7 @@
   esac
   
   cd $srcdir
  +gettextize --copy --force --intl
   $libtoolize --copy --force
   aclocal
   autoheader
  @@ .
  rm -f rpm/popt/config.rpath '@@ .'
  Index: rpm/popt/config.rpath
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 '@@ .'
  Index: rpm/popt/configure.ac
  
  $ cvs diff -u -r1.10.2.1 -r1.10.2.2 configure.ac
  --- rpm/popt/configure.ac 25 May 

[CVS] RPM: rpm/popt/ autogen.sh

2007-06-05 Thread Arkadiusz Miskiewicz
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   05-Jun-2007 22:31:17
  Branch: HEAD Handle: 2007060521311700

  Modified files:
rpm/poptautogen.sh

  Log:
Include m4 macros from m4/.

  Summary:
RevisionChanges Path
1.12+1  -1  rpm/popt/autogen.sh
  

  patch -p0 '@@ .'
  Index: rpm/popt/autogen.sh
  
  $ cvs diff -u -r1.11 -r1.12 autogen.sh
  --- rpm/popt/autogen.sh   5 Jun 2007 19:44:28 -   1.11
  +++ rpm/popt/autogen.sh   5 Jun 2007 20:31:17 -   1.12
  @@ -18,7 +18,7 @@
   cd $srcdir
   gettextize --copy --force --intl
   $libtoolize --copy --force
  -aclocal
  +aclocal -I m4
   autoheader
   automake -a -c
   autoconf
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-4_5: rpm/popt/ configure.ac rpm/popt/po/ es.po eu_ES.po...

2007-06-05 Thread Arkadiusz Miskiewicz
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   05-Jun-2007 22:12:43
  Branch: rpm-4_5  Handle: 20070525183625959776

  Modified files:   (Branch: rpm-4_5)
rpm/poptconfigure.ac
rpm/popt/po es.po
  Removed files:(Branch: rpm-4_5)
rpm/popt/po eu_ES.po fi.po id.po it.po ja.po pt_BR.po sk.po
sr.po zh.po zh_CN.po zh_TW.po

  Log:
Drop untranslated po files. Fix es.po.

  Summary:
RevisionChanges Path
1.10.2.3+1  -1  rpm/popt/configure.ac
1.47.2.1+3  -3  rpm/popt/po/es.po
1.37+0  -125rpm/popt/po/eu_ES.po
1.47+0  -125rpm/popt/po/fi.po
1.47+0  -125rpm/popt/po/id.po
1.47+0  -125rpm/popt/po/it.po
1.47+0  -124rpm/popt/po/ja.po
1.47+0  -125rpm/popt/po/pt_BR.po
1.57+0  -125rpm/popt/po/sk.po
1.47+0  -125rpm/popt/po/sr.po
1.46+0  -125rpm/popt/po/zh.po
1.3 +0  -126rpm/popt/po/zh_CN.po
1.3 +0  -124rpm/popt/po/zh_TW.po
  

  patch -p0 '@@ .'
  Index: rpm/popt/configure.ac
  
  $ cvs diff -u -r1.10.2.2 -r1.10.2.3 configure.ac
  --- rpm/popt/configure.ac 5 Jun 2007 19:58:48 -   1.10.2.2
  +++ rpm/popt/configure.ac 5 Jun 2007 20:12:41 -   1.10.2.3
  @@ -12,7 +12,7 @@
   AC_SUBST(LT_REVISION, 0)
   AC_SUBST(LT_AGE, 8)
   
  -ALL_LINGUAS=cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro 
ru sk sl sr sv tr uk wa zh zh_CN zh_TW
  +ALL_LINGUAS=cs da de es fr gl hu is ko no pl pt ro ru sl sv tr uk wa
   
   AC_ISC_POSIX
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/popt/po/es.po
  
  $ cvs diff -u -r1.47 -r1.47.2.1 es.po
  --- rpm/popt/po/es.po 25 May 2007 17:36:25 -  1.47
  +++ rpm/popt/po/es.po 5 Jun 2007 20:12:41 -   1.47.2.1
  @@ -8,12 +8,12 @@
   Project-Id-Version: popt 1.6.3\n
   Report-Msgid-Bugs-To: [EMAIL PROTECTED]\n
   POT-Creation-Date: 2007-01-21 14:25-0500\n
  -PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
  +PO-Revision-Date: 2007-01-21 14:25-0500\n
   Last-Translator: Leandro Lucarella [EMAIL PROTECTED]\n
  -Language-Team: LANGUAGE [EMAIL PROTECTED]\n
  +Language-Team: Spanish [EMAIL PROTECTED]\n
   MIME-Version: 1.0\n
   Content-Type: text/plain; charset=UTF-8\n
  -Content-Transfer-Encoding: ENCODING\n
  +Content-Transfer-Encoding: 8-bit\n
   
   #: popt.c:35
   msgid unknown errno
  @@ .
  rm -f rpm/popt/po/eu_ES.po '@@ .'
  Index: rpm/popt/po/eu_ES.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/fi.po '@@ .'
  Index: rpm/popt/po/fi.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/id.po '@@ .'
  Index: rpm/popt/po/id.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/it.po '@@ .'
  Index: rpm/popt/po/it.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/ja.po '@@ .'
  Index: rpm/popt/po/ja.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/pt_BR.po '@@ .'
  Index: rpm/popt/po/pt_BR.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/sk.po '@@ .'
  Index: rpm/popt/po/sk.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/sr.po '@@ .'
  Index: rpm/popt/po/sr.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/zh.po '@@ .'
  Index: rpm/popt/po/zh.po
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/popt/po/zh_CN.po '@@ .'
  Index: rpm/popt/po/zh_CN.po
  

[CVS] RPM: rpm-4_5: rpm/ rpmqv.c

2007-06-05 Thread Mark Hatle
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Mark Hatle
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   06-Jun-2007 00:48:08
  Branch: rpm-4_5  Handle: 2007060523480800

  Modified files:   (Branch: rpm-4_5)
rpm rpmqv.c

  Log:
Allow -bb --short-circuit.

This patch comes from PLD Linux.

Obtained from: PLD Linux

  Summary:
RevisionChanges Path
1.113.2.1   +2  -0  rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.113 -r1.113.2.1 rpmqv.c
  --- rpm/rpmqv.c   25 May 2007 17:35:52 -  1.113
  +++ rpm/rpmqv.c   5 Jun 2007 22:48:08 -   1.113.2.1
  @@ -644,6 +644,8 @@
case 'b':
ba-buildAmount |= RPMBUILD_PACKAGEBINARY;
ba-buildAmount |= RPMBUILD_CLEAN;
  + if ((ba-buildChar == 'b')  ba-shortCircuit)
  + /[EMAIL PROTECTED]@*/ break;
/[EMAIL PROTECTED]@*/
case 'i':
ba-buildAmount |= RPMBUILD_INSTALL;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: Ticket 15: EBUSY failure upgrading xulrunner

2007-06-05 Thread anonymous
  RPM CVS Repository, Ticket Change Notification
  http://rpm5.org/cvs
  

  Ticket:#15
  URL:   http://rpm5.org/cvs/tktview?tn=15

  Created:   2007-06-06 04:47:26
  Creator:   anonymous
  Contact:   [EMAIL PROTECTED]
  Title: EBUSY failure upgrading xulrunner
  Type:  Technology
  Version:   -
  Subsystem: -
  Severity:  3
  Priority:  3

  Updated:   2007-06-06 04:47:26
  Status:New
  Assigned:  -
  

  Description:

  On Jun 5, 2007, at 10:29 PM, Peter B. West wrote:
  
  I seem to have a permanent problem with mozilla-xulrunner181. It
  consistently reports as requiring update, downloads, and fails to
  upgrade with
  
  Output from [EMAIL PROTECTED]:
  error: unpacking of archive failed on file /usr/lib/xulrunner-1.8.1:
  cpio: rename failed - Resource temporarily unavailable
  
  
  Is xulrunner being used by something other than Firefox and Thunderbird?
  
  
  Likely xulrunner is active while you are trying to upgrade. The fault
  case is EBUSY return from rename(2), details with man 2 rename.
  
  Try stopping xulrunner before attempting upgrade with smart
  
  The EBUSY can likely can be handled better by rpmlib.

__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-4_5: rpm/ CHANGES rpm/python/ rpmdb-py.c rpmmi-py.c rpm...

2007-06-05 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   06-Jun-2007 07:33:13
  Branch: rpm-4_5  Handle: 2007060606331201

  Modified files:   (Branch: rpm-4_5)
rpm CHANGES
rpm/python  rpmdb-py.c rpmmi-py.c rpmmi-py.h rpmts-py.c

  Log:
- python: missing ts reference while iterating(#241751).
Reproducer is
#!/usr/bin/python
import rpm
#rpm.setVerbosity(rpm.RPMLOG_DEBUG)
for h in rpm.ts().dbMatch(name, createrepo): print h['name']

  Summary:
RevisionChanges Path
1.1360.2.4  +1  -0  rpm/CHANGES
1.16.2.1+1  -1  rpm/python/rpmdb-py.c
1.18.2.1+4  -1  rpm/python/rpmmi-py.c
1.8.2.1 +2  -1  rpm/python/rpmmi-py.h
1.65.2.1+1  -1  rpm/python/rpmts-py.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1360.2.3 -r1.1360.2.4 CHANGES
  --- rpm/CHANGES   31 May 2007 11:22:53 -  1.1360.2.3
  +++ rpm/CHANGES   6 Jun 2007 05:33:12 -   1.1360.2.4
  @@ -7,6 +7,7 @@
- build against rpm5.org cvs,
- upgrade to file-4.21 (CVE-2007-2026, CVE-2007-2799).
- revert indices to db_hash for compatibility.
  + - python: missing ts reference while iterating(#241751).

   4.4.8 - 4.4.9:
- start rpm-4.4.9 devel.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/rpmdb-py.c
  
  $ cvs diff -u -r1.16 -r1.16.2.1 rpmdb-py.c
  --- rpm/python/rpmdb-py.c 25 May 2007 17:36:31 -  1.16
  +++ rpm/python/rpmdb-py.c 6 Jun 2007 05:33:13 -   1.16.2.1
  @@ -126,7 +126,7 @@
return NULL;
   }
   
  -return rpmmi_Wrap( rpmdbInitIterator(s-db, tag, key, len) );
  +return rpmmi_Wrap( rpmdbInitIterator(s-db, tag, key, len), (PyObject 
*)s );
   }
   
   /[EMAIL PROTECTED]/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/rpmmi-py.c
  
  $ cvs diff -u -r1.18 -r1.18.2.1 rpmmi-py.c
  --- rpm/python/rpmmi-py.c 25 May 2007 17:36:31 -  1.18
  +++ rpm/python/rpmmi-py.c 6 Jun 2007 05:33:13 -   1.18.2.1
  @@ -201,6 +201,7 @@
   {
   if (s) {
s-mi = rpmdbFreeIterator(s-mi);
  + Py_DECREF(s-ref);
PyObject_Del(s);
   }
   }
  @@ -273,7 +274,7 @@
   };
   /[EMAIL PROTECTED]@*/
   
  -rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi)
  +rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s)
   {
   rpmmiObject * mio = (rpmmiObject *) PyObject_New(rpmmiObject, 
rpmmi_Type);
   
  @@ -282,5 +283,7 @@
   return NULL;
   }
   mio-mi = mi;
  +mio-ref = s;
  +Py_INCREF(mio-ref);
   return mio;
   }
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/rpmmi-py.h
  
  $ cvs diff -u -r1.8 -r1.8.2.1 rpmmi-py.h
  --- rpm/python/rpmmi-py.h 25 May 2007 17:36:31 -  1.8
  +++ rpm/python/rpmmi-py.h 6 Jun 2007 05:33:13 -   1.8.2.1
  @@ -17,6 +17,7 @@
   struct rpmmiObject_s {
   PyObject_HEAD
   PyObject *md_dict;   /*! to look like PyModuleObject */
  +PyObject *ref;   /*! for db/ts refcounting */
   rpmdbMatchIterator mi;
   } ;
   
  @@ -32,7 +33,7 @@
   /** \ingroup py_c
*/
   /[EMAIL PROTECTED]@*/
  -rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi)
  +rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s)
/[EMAIL PROTECTED]/;
   
   #ifdef __cplusplus  
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/rpmts-py.c
  
  $ cvs diff -u -r1.65 -r1.65.2.1 rpmts-py.c
  --- rpm/python/rpmts-py.c 25 May 2007 17:36:31 -  1.65
  +++ rpm/python/rpmts-py.c 6 Jun 2007 05:33:13 -   1.65.2.1
  @@ -1416,7 +1416,7 @@
}
   }
   
  -return rpmmi_Wrap( rpmtsInitIterator(s-ts, tag, key, len) );
  +return rpmmi_Wrap( rpmtsInitIterator(s-ts, tag, key, len), (PyObject 
*)s );
   }
   
   /[EMAIL PROTECTED]/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-4_5: rpm/ CHANGES rpm/python/ header-py.c

2007-06-05 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   06-Jun-2007 07:41:05
  Branch: rpm-4_5  Handle: 2007060606410401

  Modified files:   (Branch: rpm-4_5)
rpm CHANGES
rpm/python  header-py.c

  Log:
- python: pathetic band-aid pythonic return fixing (#239586).

  Summary:
RevisionChanges Path
1.1360.2.5  +1  -0  rpm/CHANGES
1.44.2.1+1  -0  rpm/python/header-py.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1360.2.4 -r1.1360.2.5 CHANGES
  --- rpm/CHANGES   6 Jun 2007 05:33:12 -   1.1360.2.4
  +++ rpm/CHANGES   6 Jun 2007 05:41:04 -   1.1360.2.5
  @@ -8,6 +8,7 @@
- upgrade to file-4.21 (CVE-2007-2026, CVE-2007-2799).
- revert indices to db_hash for compatibility.
- python: missing ts reference while iterating(#241751).
  + - python: pathetic band-aid pythonic return fixing (#239586).

   4.4.8 - 4.4.9:
- start rpm-4.4.9 devel.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/header-py.c
  
  $ cvs diff -u -r1.44 -r1.44.2.1 header-py.c
  --- rpm/python/header-py.c25 May 2007 17:36:31 -  1.44
  +++ rpm/python/header-py.c6 Jun 2007 05:41:05 -   1.44.2.1
  @@ -807,6 +807,7 @@
   case RPMTAG_CONFLICTFLAGS:
   case RPMTAG_CONFLICTVERSION:
   case RPMTAG_CHANGELOGTIME:
  +case RPMTAG_FILEVERIFYFLAGS:
forceArray = 1;
break;
   case RPMTAG_SUMMARY:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org