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:   29-Jul-2007 04:57:54
  Branch: HEAD                             Handle: 2007072903575400

  Modified files:
    rpm                     CHANGES
    rpm/lib                 verify.c

  Log:
    - rip CentOS3/x86_64 gcc-3.2.3-49.x86_64 hack-a-round. Fix gcc!

  Summary:
    Revision    Changes     Path
    1.1527      +1  -0      rpm/CHANGES
    2.168       +0  -15     rpm/lib/verify.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1526 -r1.1527 CHANGES
  --- rpm/CHANGES	29 Jul 2007 02:54:28 -0000	1.1526
  +++ rpm/CHANGES	29 Jul 2007 02:57:54 -0000	1.1527
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: rip CentOS3/x86_64 gcc-3.2.3-49.x86_64 hack-a-round. Fix gcc!
       - jbj: upgrade to db-4.6.18.
       - rse: drop MARK64 hack as it isn't RPM's business to decide for lib64 -- for this there is Autoconf option --libdir
       - rse: with --with-db-tools-integrated one can now build (and install) a db_tool which integrates all db_xxx BDB tools
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/verify.c
  ============================================================================
  $ cvs diff -u -r2.167 -r2.168 verify.c
  --- rpm/lib/verify.c	16 Jul 2007 01:32:28 -0000	2.167
  +++ rpm/lib/verify.c	29 Jul 2007 02:57:54 -0000	2.168
  @@ -461,28 +461,13 @@
   
   int showVerifyPackage(QVA_t qva, rpmts ts, Header h)
   {
  -/*
  - * XXX Sick hackery to work around qva being clobbered on CentOS3
  - * XXX using gcc-3.2.3-49.x86_64.
  - */
  -#if defined(__x86_64__)
  -static QVA_t Qva;
  -#endif
       int scareMem = 1;	/* XXX rpmpsmStage needs fi->h */
       rpmfi fi = NULL;
       int ec = 0;
       int rc;
   
  -#if defined(__x86_64__)
  -fi = rpmfiFree(fi);	/* XXX do something to confuse the optimizer. */
  -Qva = qva;
  -#endif
       fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem);
       if (fi != NULL) {
  -
  -#if defined(__x86_64__)
  -qva = Qva;
  -#endif
   	if (qva->qva_flags & VERIFY_DEPS) {
   	    int save_noise = _rpmds_unspecified_epoch_noise;
   /*@-mods@*/
  @@ .