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:   08-Nov-2007 21:33:20
  Branch: HEAD                             Handle: 2007110820331802

  Modified files:
    rpm                     CHANGES
    rpm/build               pack.c
    rpm/lib                 psm.c transaction.c verify.c
    rpm/rpmio               rpmsq.c rpmsq.h

  Log:
    - rpm.org: start hiding rpmsq internals.

  Summary:
    Revision    Changes     Path
    1.1778      +1  -0      rpm/CHANGES
    2.247       +1  -0      rpm/build/pack.c
    2.257       +1  -0      rpm/lib/psm.c
    1.350       +1  -0      rpm/lib/transaction.c
    2.175       +1  -0      rpm/lib/verify.c
    1.27        +1  -0      rpm/rpmio/rpmsq.c
    1.12        +2  -0      rpm/rpmio/rpmsq.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1777 -r1.1778 CHANGES
  --- rpm/CHANGES	8 Nov 2007 19:40:38 -0000	1.1777
  +++ rpm/CHANGES	8 Nov 2007 20:33:18 -0000	1.1778
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rpm.org: start hiding rpmsq internals.
       - jbj: fix: "trade a double free for a modest memory leak for the moment."
       - jbj: add headerModifyExtension everywhere.
       - jbj: add header{Init,Next,Free}Extension almost everywhere.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  ============================================================================
  $ cvs diff -u -r2.246 -r2.247 pack.c
  --- rpm/build/pack.c	8 Nov 2007 16:20:12 -0000	2.246
  +++ rpm/build/pack.c	8 Nov 2007 20:33:18 -0000	2.247
  @@ -14,6 +14,7 @@
   
   #include "cpio.h"
   #include "fsm.h"
  +#define	_RPMSQ_INTERNAL
   #include "psm.h"
   
   #define	_RPMFI_INTERNAL		/* XXX fi->fsm */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.256 -r2.257 psm.c
  --- rpm/lib/psm.c	8 Nov 2007 17:14:56 -0000	2.256
  +++ rpm/lib/psm.c	8 Nov 2007 20:33:18 -0000	2.257
  @@ -13,6 +13,7 @@
   
   #include "cpio.h"
   #include "fsm.h"		/* XXX CPIO_FOO/FSM_FOO constants */
  +#define	_RPMSQ_INTERNAL
   #include "psm.h"
   
   #define	_RPMEVR_INTERNAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  ============================================================================
  $ cvs diff -u -r1.349 -r1.350 transaction.c
  --- rpm/lib/transaction.c	4 Nov 2007 01:05:12 -0000	1.349
  +++ rpm/lib/transaction.c	8 Nov 2007 20:33:18 -0000	1.350
  @@ -11,6 +11,7 @@
   #include <rpmmacro.h>	/* XXX for rpmExpand */
   
   #include "fsm.h"
  +#define	_RPMSQ_INTERNAL
   #include "psm.h"
   
   #define	_RPMDB_INTERNAL	/* XXX for dbiIndexFoo() */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/verify.c
  ============================================================================
  $ cvs diff -u -r2.174 -r2.175 verify.c
  --- rpm/lib/verify.c	21 Oct 2007 23:22:55 -0000	2.174
  +++ rpm/lib/verify.c	8 Nov 2007 20:33:18 -0000	2.175
  @@ -9,6 +9,7 @@
   #define	_RPMPS_INTERNAL	/* XXX rpmps needs iterator. */
   #include <rpmcli.h>
   
  +#define	_RPMSQ_INTERNAL
   #include "psm.h"
   #define	_RPMFI_INTERNAL
   #include "rpmfi.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.c
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 rpmsq.c
  --- rpm/rpmio/rpmsq.c	6 Oct 2007 21:33:50 -0000	1.26
  +++ rpm/rpmio/rpmsq.c	8 Nov 2007 20:33:20 -0000	1.27
  @@ -222,6 +222,7 @@
   
   #endif	/* HAVE_PTHREAD_H */
   
  +#define	_RPMSQ_INTERNAL
   #include <rpmsq.h>
   
   #include "debug.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.h
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 rpmsq.h
  --- rpm/rpmio/rpmsq.h	6 Oct 2007 19:40:23 -0000	1.11
  +++ rpm/rpmio/rpmsq.h	8 Nov 2007 20:33:20 -0000	1.12
  @@ -30,6 +30,7 @@
   extern int _rpmsq_debug;
   /*@=redecl@*/
   
  +#if defined(_RPMSQ_INTERNAL)
   /**
    * SIGCHLD queue element.
    */
  @@ -50,6 +51,7 @@
       pthread_cond_t cond;
   #endif
   };
  +#endif
   
   /*@-exportlocal@*/
   /*@unchecked@*/
  @@ .